Fix up saving multi condition form

elie222 · Dec 21, 2024 · c037166 · c037166
1 parent 3ecbf70
commit c037166
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/apps/web/app/(app)/automation/RuleForm.tsx b/apps/web/app/(app)/automation/RuleForm.tsx
@@ -28,7 +28,7 @@ import {
   SectionDescription,
   TypographyH3,
 } from "@/components/Typography";
-import { ActionType, type CategoryFilterType, RuleType } from "@prisma/client";
+import { ActionType, CategoryFilterType, RuleType } from "@prisma/client";
 import { createRuleAction, updateRuleAction } from "@/utils/actions/rule";
 import {
   type CreateRuleBody,
@@ -163,8 +163,6 @@ export function RuleForm({ rule }: { rule: CreateRuleBody & { id?: string } }) {
     return unusedCondition;
   }, [conditions]);
 
-  console.log("errors", errors);
-
   // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
   useEffect(() => {
     trigger("conditions");
@@ -314,7 +312,7 @@ export function RuleForm({ rule }: { rule: CreateRuleBody & { id?: string } }) {
                   <>
                     <div className="flex items-center gap-4">
                       <RadioGroup
-                        defaultValue="include"
+                        defaultValue={CategoryFilterType.INCLUDE}
                         value={
                           watch(`conditions.${index}.categoryFilterType`) ||
                           undefined
@@ -328,11 +326,17 @@ export function RuleForm({ rule }: { rule: CreateRuleBody & { id?: string } }) {
                         className="flex gap-6"
                       >
                         <div className="flex items-center space-x-2">
-                          <RadioGroupItem value="include" id="include" />
+                          <RadioGroupItem
+                            value={CategoryFilterType.INCLUDE}
+                            id="include"
+                          />
                           <Label name="include" label="Match" />
                         </div>
                         <div className="flex items-center space-x-2">
-                          <RadioGroupItem value="exclude" id="exclude" />
+                          <RadioGroupItem
+                            value={CategoryFilterType.EXCLUDE}
+                            id="exclude"
+                          />
                           <Label name="exclude" label="Skip" />
                         </div>
                       </RadioGroup>
@@ -682,9 +686,6 @@ function GroupsTab(props: {
                 {...props.registerProps}
                 // TODO: fix this
                 // error={props.errors.groupId}
-                // error={
-                //   errors.conditions?.[index]?.type as FieldError | undefined
-                // }
               />
             </div>
           )}

diff --git a/apps/web/utils/actions/rule.ts b/apps/web/utils/actions/rule.ts
@@ -35,7 +35,6 @@ export const createRuleAction = withActionInstrumentation(
       const rule = await prisma.rule.create({
         data: {
           name: body.name || "",
-          instructions: body.instructions || "",
           automate: body.automate ?? undefined,
           runOnThreads: body.runOnThreads ?? undefined,
           actions: body.actions
@@ -58,6 +57,8 @@ export const createRuleAction = withActionInstrumentation(
               }
             : undefined,
           userId: session.user.id,
+          // conditions
+          instructions: conditions.instructions || null,
           from: conditions.from || null,
           to: conditions.to || null,
           subject: conditions.subject || null,
@@ -119,10 +120,11 @@ export const updateRuleAction = withActionInstrumentation(
         prisma.rule.update({
           where: { id: body.id, userId: session.user.id },
           data: {
-            instructions: body.instructions || "",
             automate: body.automate ?? undefined,
             runOnThreads: body.runOnThreads ?? undefined,
             name: body.name || undefined,
+            // conditions
+            instructions: conditions.instructions || null,
             from: conditions.from || null,
             to: conditions.to || null,
             subject: conditions.subject || null,

diff --git a/apps/web/utils/actions/validation.ts b/apps/web/utils/actions/validation.ts
@@ -58,37 +58,34 @@ export const zodRuleType = z.enum([
 ]);
 
 const zodAiCondition = z.object({
-  type: z.literal(RuleType.AI),
-  instructions: z.string(),
+  instructions: z.string().nullish(),
 });
 
 const zodGroupCondition = z.object({
-  type: z.literal(RuleType.GROUP),
-  groupId: z.string(),
+  groupId: z.string().nullish(),
 });
 
 const zodStaticCondition = z.object({
-  type: z.literal(RuleType.STATIC),
   to: z.string().nullish(),
   from: z.string().nullish(),
   subject: z.string().nullish(),
   body: z.string().nullish(),
 });
 
 const zodCategoryCondition = z.object({
-  type: z.literal(RuleType.CATEGORY),
   categoryFilterType: z
     .enum([CategoryFilterType.INCLUDE, CategoryFilterType.EXCLUDE])
     .nullish(),
   categoryFilters: z.array(z.string()).nullish(),
 });
 
-const zodCondition = z.union([
-  zodAiCondition,
-  zodGroupCondition,
-  zodStaticCondition,
-  zodCategoryCondition,
-]);
+const zodCondition = z.object({
+  type: zodRuleType,
+  ...zodAiCondition.shape,
+  ...zodGroupCondition.shape,
+  ...zodStaticCondition.shape,
+  ...zodCategoryCondition.shape,
+});
 export type ZodCondition = z.infer<typeof zodCondition>;
 
 export const createRuleBody = z.object({

diff --git a/apps/web/utils/condition.ts b/apps/web/utils/condition.ts
@@ -114,7 +114,7 @@ const staticEmptyCondition = {
 
 const categoryEmptyCondition = {
   type: RuleType.CATEGORY,
-  categoryFilterType: CategoryFilterType.INCLUDE,
+  categoryFilterType: null,
   categoryFilters: null,
 };