From c79bff8dbb6eb0fcb999fed820fd3fcba23d1d59 Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Sat, 31 Aug 2024 15:35:00 -0700
Subject: [PATCH 1/6] add advise dialog form refactor

---
 .../advises/add-advise-dialog-form.tsx        | 61 +++++++++++++++++++
 src/components/advises/add-advise.tsx         | 52 +---------------
 2 files changed, 63 insertions(+), 50 deletions(-)
 create mode 100644 src/components/advises/add-advise-dialog-form.tsx

diff --git a/src/components/advises/add-advise-dialog-form.tsx b/src/components/advises/add-advise-dialog-form.tsx
new file mode 100644
index 0000000..dfb3657
--- /dev/null
+++ b/src/components/advises/add-advise-dialog-form.tsx
@@ -0,0 +1,61 @@
+'use client';
+
+import { createAdvise } from "@/actions/advises/create-advise";
+import { AdviseFormData, adviseSchema } from "@/schemas/advise-schema";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/form";
+import { Textarea } from "../ui/textarea";
+import { Button } from "../ui/button";
+import { Dispatch, SetStateAction } from "react";
+
+interface DialogFormProps {
+  setDialogOpen(data: boolean): void;
+}
+
+export const AddAdviseDialogForm = (props: DialogFormProps) => {
+  const form = useForm<AdviseFormData>({
+    resolver: zodResolver(adviseSchema),
+    defaultValues: {
+      content: '',
+    },
+  });
+
+  function onSubmit({ content }: AdviseFormData) {
+    toast.promise(createAdvise(content), {
+      loading: 'Creando consejo...',
+      success: () => {
+        form.reset();
+        return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
+      },
+      error: 'Ocurrió un error al publicar el consejo',
+    });
+
+    props.setDialogOpen(false);
+  }
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+        <FormField
+          control={form.control}
+          name="content"
+          render={({ field }) => (
+            <FormItem>
+              <FormControl>
+                <Textarea placeholder="Escribí acá tu consejo..." {...field} />
+              </FormControl>
+
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <Button type="submit" className="w-full">
+          Publicar
+        </Button>
+      </form>
+    </Form>
+  )
+}
\ No newline at end of file
diff --git a/src/components/advises/add-advise.tsx b/src/components/advises/add-advise.tsx
index 453e002..d88596d 100644
--- a/src/components/advises/add-advise.tsx
+++ b/src/components/advises/add-advise.tsx
@@ -9,38 +9,12 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog';
-import { Textarea } from '@/components/ui/textarea';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { Form, FormControl, FormField, FormItem, FormMessage } from '@/components/ui/form';
-import { toast } from 'sonner';
 import { useState } from 'react';
-import { createAdvise } from '@actions/advises/create-advise';
-import { adviseSchema, AdviseFormData } from '@/schemas/advise-schema';
+import { AddAdviseDialogForm } from './add-advise-dialog-form';
 
 export const AddAdvise = () => {
   const [dialogOpen, setDialogOpen] = useState(false);
 
-  const form = useForm<AdviseFormData>({
-    resolver: zodResolver(adviseSchema),
-    defaultValues: {
-      content: '',
-    },
-  });
-
-  function onSubmit({ content }: AdviseFormData) {
-    toast.promise(createAdvise(content), {
-      loading: 'Creando consejo...',
-      success: () => {
-        form.reset();
-        return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
-      },
-      error: 'Ocurrió un error al publicar el consejo',
-    });
-
-    setDialogOpen(false);
-  }
-
   return (
     <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
       <DialogTrigger asChild>
@@ -49,33 +23,11 @@ export const AddAdvise = () => {
           Publicar un consejo
         </Button>
       </DialogTrigger>
-
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Publicar un consejo</DialogTitle>
         </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
-            <FormField
-              control={form.control}
-              name="content"
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Textarea placeholder="Escribí acá tu consejo..." {...field} />
-                  </FormControl>
-
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button type="submit" className="w-full">
-              Publicar
-            </Button>
-          </form>
-        </Form>
+        <AddAdviseDialogForm setDialogOpen={setDialogOpen} />
       </DialogContent>
     </Dialog>
   );

From 20a3ecf5727c56f56bc14fbcb7f9f33cbdca0eef Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Sat, 31 Aug 2024 15:35:58 -0700
Subject: [PATCH 2/6] #7 add advise dialog form refactor

---
 .../advises/add-advise-dialog-form.tsx        | 61 +++++++++++++++++++
 src/components/advises/add-advise.tsx         | 52 +---------------
 2 files changed, 63 insertions(+), 50 deletions(-)
 create mode 100644 src/components/advises/add-advise-dialog-form.tsx

diff --git a/src/components/advises/add-advise-dialog-form.tsx b/src/components/advises/add-advise-dialog-form.tsx
new file mode 100644
index 0000000..dfb3657
--- /dev/null
+++ b/src/components/advises/add-advise-dialog-form.tsx
@@ -0,0 +1,61 @@
+'use client';
+
+import { createAdvise } from "@/actions/advises/create-advise";
+import { AdviseFormData, adviseSchema } from "@/schemas/advise-schema";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/form";
+import { Textarea } from "../ui/textarea";
+import { Button } from "../ui/button";
+import { Dispatch, SetStateAction } from "react";
+
+interface DialogFormProps {
+  setDialogOpen(data: boolean): void;
+}
+
+export const AddAdviseDialogForm = (props: DialogFormProps) => {
+  const form = useForm<AdviseFormData>({
+    resolver: zodResolver(adviseSchema),
+    defaultValues: {
+      content: '',
+    },
+  });
+
+  function onSubmit({ content }: AdviseFormData) {
+    toast.promise(createAdvise(content), {
+      loading: 'Creando consejo...',
+      success: () => {
+        form.reset();
+        return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
+      },
+      error: 'Ocurrió un error al publicar el consejo',
+    });
+
+    props.setDialogOpen(false);
+  }
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+        <FormField
+          control={form.control}
+          name="content"
+          render={({ field }) => (
+            <FormItem>
+              <FormControl>
+                <Textarea placeholder="Escribí acá tu consejo..." {...field} />
+              </FormControl>
+
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <Button type="submit" className="w-full">
+          Publicar
+        </Button>
+      </form>
+    </Form>
+  )
+}
\ No newline at end of file
diff --git a/src/components/advises/add-advise.tsx b/src/components/advises/add-advise.tsx
index 453e002..d88596d 100644
--- a/src/components/advises/add-advise.tsx
+++ b/src/components/advises/add-advise.tsx
@@ -9,38 +9,12 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog';
-import { Textarea } from '@/components/ui/textarea';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { Form, FormControl, FormField, FormItem, FormMessage } from '@/components/ui/form';
-import { toast } from 'sonner';
 import { useState } from 'react';
-import { createAdvise } from '@actions/advises/create-advise';
-import { adviseSchema, AdviseFormData } from '@/schemas/advise-schema';
+import { AddAdviseDialogForm } from './add-advise-dialog-form';
 
 export const AddAdvise = () => {
   const [dialogOpen, setDialogOpen] = useState(false);
 
-  const form = useForm<AdviseFormData>({
-    resolver: zodResolver(adviseSchema),
-    defaultValues: {
-      content: '',
-    },
-  });
-
-  function onSubmit({ content }: AdviseFormData) {
-    toast.promise(createAdvise(content), {
-      loading: 'Creando consejo...',
-      success: () => {
-        form.reset();
-        return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
-      },
-      error: 'Ocurrió un error al publicar el consejo',
-    });
-
-    setDialogOpen(false);
-  }
-
   return (
     <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
       <DialogTrigger asChild>
@@ -49,33 +23,11 @@ export const AddAdvise = () => {
           Publicar un consejo
         </Button>
       </DialogTrigger>
-
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Publicar un consejo</DialogTitle>
         </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
-            <FormField
-              control={form.control}
-              name="content"
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Textarea placeholder="Escribí acá tu consejo..." {...field} />
-                  </FormControl>
-
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button type="submit" className="w-full">
-              Publicar
-            </Button>
-          </form>
-        </Form>
+        <AddAdviseDialogForm setDialogOpen={setDialogOpen} />
       </DialogContent>
     </Dialog>
   );

From 433209a10082a7fa8fa9bff33e4feb35fab80c04 Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Sat, 31 Aug 2024 22:52:47 +0000
Subject: [PATCH 3/6] #7 Adding parameter destructuring

---
 src/components/advises/add-advise-dialog-form.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/advises/add-advise-dialog-form.tsx b/src/components/advises/add-advise-dialog-form.tsx
index dfb3657..49591db 100644
--- a/src/components/advises/add-advise-dialog-form.tsx
+++ b/src/components/advises/add-advise-dialog-form.tsx
@@ -8,13 +8,12 @@ import { toast } from "sonner";
 import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/form";
 import { Textarea } from "../ui/textarea";
 import { Button } from "../ui/button";
-import { Dispatch, SetStateAction } from "react";
 
 interface DialogFormProps {
   setDialogOpen(data: boolean): void;
 }
 
-export const AddAdviseDialogForm = (props: DialogFormProps) => {
+export const AddAdviseDialogForm = ({ setDialogOpen }: DialogFormProps) => {
   const form = useForm<AdviseFormData>({
     resolver: zodResolver(adviseSchema),
     defaultValues: {
@@ -32,7 +31,7 @@ export const AddAdviseDialogForm = (props: DialogFormProps) => {
       error: 'Ocurrió un error al publicar el consejo',
     });
 
-    props.setDialogOpen(false);
+    setDialogOpen(false);
   }
 
   return (

From 30da2d5fd3369798223c7a080c28903e3a8fa9bd Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Tue, 3 Sep 2024 04:30:55 +0000
Subject: [PATCH 4/6] Form renamed

---
 ...advise-dialog-form.tsx => advise-form.tsx} | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)
 rename src/components/advises/{add-advise-dialog-form.tsx => advise-form.tsx} (51%)

diff --git a/src/components/advises/add-advise-dialog-form.tsx b/src/components/advises/advise-form.tsx
similarity index 51%
rename from src/components/advises/add-advise-dialog-form.tsx
rename to src/components/advises/advise-form.tsx
index 49591db..c20b832 100644
--- a/src/components/advises/add-advise-dialog-form.tsx
+++ b/src/components/advises/advise-form.tsx
@@ -8,20 +8,28 @@ import { toast } from "sonner";
 import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/form";
 import { Textarea } from "../ui/textarea";
 import { Button } from "../ui/button";
+import { editAdvise } from "@/actions/advises/edit-advise";
+import { EditAdviseDialogProps } from "./edit-advise-dialog";
 
-interface DialogFormProps {
-  setDialogOpen(data: boolean): void;
+interface AdviceFormProps {
+  setDialogOpen?: (data: boolean) => void;
+  editAdviseOptions?: EditAdviseDialogProps;
 }
 
-export const AddAdviseDialogForm = ({ setDialogOpen }: DialogFormProps) => {
+export const AdviseForm = ({ setDialogOpen, editAdviseOptions }: AdviceFormProps) => {
+
+  const adviseId = editAdviseOptions?.adviseId ?? '';
+  const initialContent = editAdviseOptions?.initialContent ?? '';
+  const onOpenChange = editAdviseOptions ? editAdviseOptions.onOpenChange : () => { };
+
   const form = useForm<AdviseFormData>({
     resolver: zodResolver(adviseSchema),
     defaultValues: {
-      content: '',
+      content: initialContent,
     },
   });
 
-  function onSubmit({ content }: AdviseFormData) {
+  const onSubmitAddAdvise = ({ content }: AdviseFormData) => {
     toast.promise(createAdvise(content), {
       loading: 'Creando consejo...',
       success: () => {
@@ -31,12 +39,24 @@ export const AddAdviseDialogForm = ({ setDialogOpen }: DialogFormProps) => {
       error: 'Ocurrió un error al publicar el consejo',
     });
 
-    setDialogOpen(false);
+    if (setDialogOpen) setDialogOpen(false);
   }
 
+  const onSubmitEditAdvise = ({ content }: AdviseFormData) => {
+    toast.promise(editAdvise({ id: adviseId, content }), {
+      loading: 'Editando consejo...',
+      success: () => {
+        form.reset({ content });
+        onOpenChange(false);
+        return 'Tu consejo fue editado exitosamente.';
+      },
+      error: 'Ocurrió un error al editar el consejo',
+    });
+  };
+
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+      <form onSubmit={form.handleSubmit(editAdviseOptions ? onSubmitEditAdvise : onSubmitAddAdvise)} className="space-y-8">
         <FormField
           control={form.control}
           name="content"
@@ -52,7 +72,7 @@ export const AddAdviseDialogForm = ({ setDialogOpen }: DialogFormProps) => {
         />
 
         <Button type="submit" className="w-full">
-          Publicar
+          {editAdviseOptions ? "Guardar Cambios" : "Publicar"}
         </Button>
       </form>
     </Form>

From a2c2b15e0e13eb9dc066f16dce2fa0346a119dd8 Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Tue, 3 Sep 2024 04:31:12 +0000
Subject: [PATCH 5/6] add and edit advise updated

---
 src/components/advises/add-advise.tsx         |  4 +-
 src/components/advises/edit-advise-dialog.tsx | 52 ++-----------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/src/components/advises/add-advise.tsx b/src/components/advises/add-advise.tsx
index d88596d..79ff3a4 100644
--- a/src/components/advises/add-advise.tsx
+++ b/src/components/advises/add-advise.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from '@/components/ui/dialog';
 import { useState } from 'react';
-import { AddAdviseDialogForm } from './add-advise-dialog-form';
+import { AdviseForm } from './advise-form';
 
 export const AddAdvise = () => {
   const [dialogOpen, setDialogOpen] = useState(false);
@@ -27,7 +27,7 @@ export const AddAdvise = () => {
         <DialogHeader>
           <DialogTitle>Publicar un consejo</DialogTitle>
         </DialogHeader>
-        <AddAdviseDialogForm setDialogOpen={setDialogOpen} />
+        <AdviseForm setDialogOpen={setDialogOpen} />
       </DialogContent>
     </Dialog>
   );
diff --git a/src/components/advises/edit-advise-dialog.tsx b/src/components/advises/edit-advise-dialog.tsx
index 0c625c2..e763d88 100644
--- a/src/components/advises/edit-advise-dialog.tsx
+++ b/src/components/advises/edit-advise-dialog.tsx
@@ -1,16 +1,9 @@
 'use client';
 
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
-import { Form, FormControl, FormField, FormItem, FormMessage } from '@/components/ui/form';
-import { Textarea } from '@/components/ui/textarea';
-import { Button } from '@/components/ui/button';
-import { editAdvise } from '@/actions/advises/edit-advise';
-import { toast } from 'sonner';
-import { adviseSchema, AdviseFormData } from '@/schemas/advise-schema';
+import { AdviseForm } from './advise-form';
 
-interface EditAdviseDialogProps {
+export interface EditAdviseDialogProps {
   adviseId: string;
   initialContent: string;
   isOpen: boolean;
@@ -23,24 +16,7 @@ export const EditAdviseDialog = ({
   isOpen,
   onOpenChange,
 }: EditAdviseDialogProps) => {
-  const form = useForm<AdviseFormData>({
-    resolver: zodResolver(adviseSchema),
-    defaultValues: {
-      content: initialContent,
-    },
-  });
-
-  const onSubmitEditAdvise = ({ content }: AdviseFormData) => {
-    toast.promise(editAdvise({ id: adviseId, content }), {
-      loading: 'Editando consejo...',
-      success: () => {
-        form.reset({ content });
-        onOpenChange(false);
-        return 'Tu consejo fue editado exitosamente.';
-      },
-      error: 'Ocurrió un error al editar el consejo',
-    });
-  };
+  const editAdviseOptions = { adviseId, initialContent, isOpen, onOpenChange }
 
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
@@ -48,27 +24,7 @@ export const EditAdviseDialog = ({
         <DialogHeader>
           <DialogTitle>Editar consejo</DialogTitle>
         </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmitEditAdvise)} className="space-y-8">
-            <FormField
-              control={form.control}
-              name="content"
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Textarea {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button type="submit" className="w-full">
-              Guardar cambios
-            </Button>
-          </form>
-        </Form>
+        <AdviseForm editAdviseOptions={editAdviseOptions} />
       </DialogContent>
     </Dialog>
   );

From 7ab7b7c2e90e1342f2cfd86e569fd0d834829ba1 Mon Sep 17 00:00:00 2001
From: Benjamin Cortes <benjacortesdev@gmail.com>
Date: Fri, 6 Sep 2024 03:52:53 +0000
Subject: [PATCH 6/6] #8 addressing comments

---
 src/components/advises/add-advise.tsx         |  8 ++-
 src/components/advises/advise-card.tsx        | 12 ++--
 src/components/advises/advise-form.tsx        | 70 ++++++++++---------
 ...te-advise-dialog.tsx => delete-advise.tsx} |  8 +--
 ...edit-advise-dialog.tsx => edit-advise.tsx} | 19 +++--
 5 files changed, 65 insertions(+), 52 deletions(-)
 rename src/components/advises/{delete-advise-dialog.tsx => delete-advise.tsx} (84%)
 rename src/components/advises/{edit-advise-dialog.tsx => edit-advise.tsx} (55%)

diff --git a/src/components/advises/add-advise.tsx b/src/components/advises/add-advise.tsx
index 79ff3a4..f260125 100644
--- a/src/components/advises/add-advise.tsx
+++ b/src/components/advises/add-advise.tsx
@@ -10,10 +10,14 @@ import {
   DialogTrigger,
 } from '@/components/ui/dialog';
 import { useState } from 'react';
-import { AdviseForm } from './advise-form';
+import { AdviseForm, AdviseFormProps } from './advise-form';
 
 export const AddAdvise = () => {
   const [dialogOpen, setDialogOpen] = useState(false);
+  const addAdviseOptions = {
+    mode: "create",
+    setDialogOpen: setDialogOpen
+  } as AdviseFormProps
 
   return (
     <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
@@ -27,7 +31,7 @@ export const AddAdvise = () => {
         <DialogHeader>
           <DialogTitle>Publicar un consejo</DialogTitle>
         </DialogHeader>
-        <AdviseForm setDialogOpen={setDialogOpen} />
+        <AdviseForm {...addAdviseOptions} />
       </DialogContent>
     </Dialog>
   );
diff --git a/src/components/advises/advise-card.tsx b/src/components/advises/advise-card.tsx
index d5f42d9..f3827bb 100644
--- a/src/components/advises/advise-card.tsx
+++ b/src/components/advises/advise-card.tsx
@@ -12,8 +12,8 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { DeleteAdviseDialog } from './delete-advise-dialog';
-import { EditAdviseDialog } from './edit-advise-dialog';
+import { DeleteAdvise } from './delete-advise';
+import { EditAdvise } from './edit-advise';
 import { useSession } from 'next-auth/react';
 import { format } from 'date-fns';
 import { es } from 'date-fns/locale';
@@ -69,17 +69,17 @@ export const AdviseCard = ({ advise }: { advise: Advise & { author: User } }) =>
         {isAuthor && Options}
       </CardHeader>
 
-      <DeleteAdviseDialog
+      <DeleteAdvise
         adviseId={advise.id}
         isOpen={isDeleteDialogOpen}
-        onOpenChange={setIsDeleteDialogOpen}
+        setDialogOpen={setIsDeleteDialogOpen}
       />
 
-      <EditAdviseDialog
+      <EditAdvise
         adviseId={advise.id}
         initialContent={advise.content}
         isOpen={isEditDialogOpen}
-        onOpenChange={setIsEditDialogOpen}
+        setDialogOpen={setIsEditDialogOpen}
       />
 
       <CardContent className="px-4 py-6">
diff --git a/src/components/advises/advise-form.tsx b/src/components/advises/advise-form.tsx
index c20b832..963be5e 100644
--- a/src/components/advises/advise-form.tsx
+++ b/src/components/advises/advise-form.tsx
@@ -9,54 +9,58 @@ import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/form"
 import { Textarea } from "../ui/textarea";
 import { Button } from "../ui/button";
 import { editAdvise } from "@/actions/advises/edit-advise";
-import { EditAdviseDialogProps } from "./edit-advise-dialog";
 
-interface AdviceFormProps {
-  setDialogOpen?: (data: boolean) => void;
-  editAdviseOptions?: EditAdviseDialogProps;
+type CreateFormProps = {
+  mode: "create";
 }
 
-export const AdviseForm = ({ setDialogOpen, editAdviseOptions }: AdviceFormProps) => {
+type EditFormProps = {
+  mode: "edit",
+  adviseId: string;
+  isOpen: boolean;
+  initialContent: string;
+}
+
+export type AdviseFormProps = (EditFormProps | CreateFormProps) & {
+  setDialogOpen: (open: boolean) => void;
+}
 
-  const adviseId = editAdviseOptions?.adviseId ?? '';
-  const initialContent = editAdviseOptions?.initialContent ?? '';
-  const onOpenChange = editAdviseOptions ? editAdviseOptions.onOpenChange : () => { };
+export const AdviseForm = (props: AdviseFormProps) => {
 
   const form = useForm<AdviseFormData>({
     resolver: zodResolver(adviseSchema),
     defaultValues: {
-      content: initialContent,
+      content: props.mode === "edit" ? props.initialContent : '',
     },
   });
 
-  const onSubmitAddAdvise = ({ content }: AdviseFormData) => {
-    toast.promise(createAdvise(content), {
-      loading: 'Creando consejo...',
-      success: () => {
-        form.reset();
-        return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
-      },
-      error: 'Ocurrió un error al publicar el consejo',
-    });
+  const onSubmit = ({ content }: AdviseFormData) => {
+    if (props.mode === "create") {
+      toast.promise(createAdvise(content), {
+        loading: 'Creando consejo...',
+        success: () => {
+          form.reset();
+          return 'Tu consejo fue publicado exitosamente. Gracias por compartir!';
+        },
+        error: 'Ocurrió un error al publicar el consejo',
+      });
+    } else {
+      toast.promise(editAdvise({ id: props.adviseId, content }), {
+        loading: 'Editando consejo...',
+        success: () => {
+          form.reset({content});
+          return 'Tu consejo fue editado exitosamente.';
+        },
+        error: 'Ocurrió un error al editar el consejo',
+      });
+    }
 
-    if (setDialogOpen) setDialogOpen(false);
+    props.setDialogOpen(false);
   }
 
-  const onSubmitEditAdvise = ({ content }: AdviseFormData) => {
-    toast.promise(editAdvise({ id: adviseId, content }), {
-      loading: 'Editando consejo...',
-      success: () => {
-        form.reset({ content });
-        onOpenChange(false);
-        return 'Tu consejo fue editado exitosamente.';
-      },
-      error: 'Ocurrió un error al editar el consejo',
-    });
-  };
-
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(editAdviseOptions ? onSubmitEditAdvise : onSubmitAddAdvise)} className="space-y-8">
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
         <FormField
           control={form.control}
           name="content"
@@ -72,7 +76,7 @@ export const AdviseForm = ({ setDialogOpen, editAdviseOptions }: AdviceFormProps
         />
 
         <Button type="submit" className="w-full">
-          {editAdviseOptions ? "Guardar Cambios" : "Publicar"}
+          {props.mode === "edit" ? "Guardar Cambios" : "Publicar"}
         </Button>
       </form>
     </Form>
diff --git a/src/components/advises/delete-advise-dialog.tsx b/src/components/advises/delete-advise.tsx
similarity index 84%
rename from src/components/advises/delete-advise-dialog.tsx
rename to src/components/advises/delete-advise.tsx
index b013629..428e981 100644
--- a/src/components/advises/delete-advise-dialog.tsx
+++ b/src/components/advises/delete-advise.tsx
@@ -14,15 +14,15 @@ import {
 interface DeleteAdviseDialogProps {
   adviseId: string;
   isOpen: boolean;
-  onOpenChange: (isOpen: boolean) => void;
+  setDialogOpen: (isOpen: boolean) => void;
 }
 
-export const DeleteAdviseDialog = ({ adviseId, isOpen, onOpenChange }: DeleteAdviseDialogProps) => {
+export const DeleteAdvise = ({ adviseId, isOpen, setDialogOpen }: DeleteAdviseDialogProps) => {
   const handleDelete = () => {
     toast.promise(deleteAdvise(adviseId), {
       loading: 'Eliminando consejo...',
       success: () => {
-        onOpenChange(false);
+        setDialogOpen(false);
         return 'Consejo eliminado correctamente';
       },
       error: 'Error al eliminar el consejo',
@@ -30,7 +30,7 @@ export const DeleteAdviseDialog = ({ adviseId, isOpen, onOpenChange }: DeleteAdv
   };
 
   return (
-    <AlertDialog open={isOpen} onOpenChange={onOpenChange}>
+    <AlertDialog open={isOpen} onOpenChange={setDialogOpen}>
       <AlertDialogContent>
         <AlertDialogHeader>
           <AlertDialogTitle>¿Estás seguro de eliminar este consejo?</AlertDialogTitle>
diff --git a/src/components/advises/edit-advise-dialog.tsx b/src/components/advises/edit-advise.tsx
similarity index 55%
rename from src/components/advises/edit-advise-dialog.tsx
rename to src/components/advises/edit-advise.tsx
index e763d88..dccf94a 100644
--- a/src/components/advises/edit-advise-dialog.tsx
+++ b/src/components/advises/edit-advise.tsx
@@ -1,30 +1,35 @@
 'use client';
 
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
-import { AdviseForm } from './advise-form';
+import { AdviseForm, AdviseFormProps } from './advise-form';
 
 export interface EditAdviseDialogProps {
   adviseId: string;
   initialContent: string;
   isOpen: boolean;
-  onOpenChange: (open: boolean) => void;
+  setDialogOpen: (open: boolean) => void;
 }
 
-export const EditAdviseDialog = ({
+export const EditAdvise = ({
   adviseId,
   initialContent,
   isOpen,
-  onOpenChange,
+  setDialogOpen,
 }: EditAdviseDialogProps) => {
-  const editAdviseOptions = { adviseId, initialContent, isOpen, onOpenChange }
+  const editAdviseOptions = { 
+    mode: "edit",
+    adviseId,
+    initialContent,
+    setDialogOpen 
+  } as AdviseFormProps
 
   return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+    <Dialog open={isOpen} onOpenChange={setDialogOpen}>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Editar consejo</DialogTitle>
         </DialogHeader>
-        <AdviseForm editAdviseOptions={editAdviseOptions} />
+        <AdviseForm {...editAdviseOptions} />
       </DialogContent>
     </Dialog>
   );