Add Zod validation to prevent creating Bill without payment option

openmrs · Jun 18, 2024 · 369b873 · 369b873
1 parent 58f9fed
commit 369b873
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/billable-services/create-edit/add-billable-service.component.tsx b/src/billable-services/create-edit/add-billable-service.component.tsx
@@ -44,7 +44,9 @@ const servicePriceSchema = z.object({
   ]),
 });
 
-const paymentFormSchema = z.object({ payment: z.array(servicePriceSchema) });
+const paymentFormSchema = z.object({
+  payment: z.array(servicePriceSchema).min(1, 'At least one payment option is required'),
+});
 
 const DEFAULT_PAYMENT_OPTION = { paymentMode: '', price: 0 };
 
@@ -61,7 +63,7 @@ const AddBillableService: React.FC = () => {
     formState: { errors },
   } = useForm<any>({
     mode: 'all',
-    defaultValues: {},
+    defaultValues: { payment: [DEFAULT_PAYMENT_OPTION] },
     resolver: zodResolver(paymentFormSchema),
   });
   const { fields, remove, append } = useFieldArray({ name: 'payment', control: control });
@@ -288,7 +290,7 @@ const AddBillableService: React.FC = () => {
                 )}
               />
               <div className={styles.removeButtonContainer}>
-                <TrashCan onClick={handleRemovePaymentMode} className={styles.removeButton} size={20} />
+                <TrashCan onClick={() => handleRemovePaymentMode(index)} className={styles.removeButton} size={20} />
               </div>
             </div>
           ))}