feat: Auto-Save , Update and Delete Drafts

apps/mail/components/create/create-email.tsx

@@ -10,6 +10,7 @@ import { EmailComposer } from './email-composer';
 import { useSession } from '@/lib/auth-client';
 import { serializeFiles } from '@/lib/schemas';
 import { useDraft } from '@/hooks/use-drafts';
+import { useThreads } from '@/hooks/use-threads';
 import { useEffect, useState } from 'react';
 
 import type { Attachment } from '@/types';
@@ -54,13 +55,15 @@ export function CreateEmail({
     data: draft,
     isLoading: isDraftLoading,
     error: draftError,
+    refetch: refetchDraft
   } = useDraft(draftId ?? propDraftId ?? null);
 
   const [, setIsDraftFailed] = useState(false);
   const trpc = useTRPC();
   const { mutateAsync: sendEmail } = useMutation(trpc.mail.send.mutationOptions());
   const [isComposeOpen, setIsComposeOpen] = useQueryState('isComposeOpen');
   const [, setThreadId] = useQueryState('threadId');
+  const [{refetch: refetchThreads }] = useThreads();
   const [, setActiveReplyId] = useQueryState('activeReplyId');
   const { data: activeConnection } = useActiveConnection();
   const { data: settings, isLoading: settingsLoading } = useSettings();
@@ -144,6 +147,8 @@ export function CreateEmail({
     }
   };
 
+
+
   const base64ToFile = (base64: string, filename: string, mimeType: string): File | null => {
     try {
       const byteString = atob(base64);
@@ -169,22 +174,19 @@ export function CreateEmail({
         <div className="flex min-h-screen flex-col items-center justify-center gap-1">
           <div className="flex w-[750px] justify-start">
             <DialogClose asChild className="flex">
-              <button className="dark:bg-panelDark flex items-center gap-1 rounded-lg bg-[#F0F0F0] px-2 py-1.5">
+              <button onClick={
+                  () => { 
+                    refetchThreads()
+                    }
+                  } 
+                  className="dark:bg-panelDark flex items-center gap-1 rounded-lg bg-[#F0F0F0] px-2 py-1.5">
                 <X className="fill-muted-foreground mt-0.5 h-3.5 w-3.5 dark:fill-[#929292]" />
                 <span className="text-muted-foreground text-sm font-medium dark:text-white">
                   esc
                 </span>
               </button>
             </DialogClose>
           </div>
-          {isDraftLoading ? (
-            <div className="flex h-[600px] w-[750px] items-center justify-center rounded-2xl border">
-              <div className="text-center">
-                <div className="mx-auto mb-4 h-6 w-6 animate-spin rounded-full border-2 border-gray-300 border-t-blue-600"></div>
-                <p>Loading draft...</p>
-              </div>
-            </div>
-          ) : (
             <EmailComposer
               key={typedDraft?.id || 'composer'}
               className="mb-12 rounded-2xl border"
@@ -208,12 +210,14 @@ export function CreateEmail({
                 setIsComposeOpen(null);
                 setDraftId(null);
               }}
+              onDraftUpdate={() => {
+                refetchDraft();
+              }}
               initialAttachments={files}
               initialSubject={typedDraft?.subject || initialSubject}
               autofocus={false}
               settingsLoading={settingsLoading}
             />
-          )}
         </div>
       </Dialog>
     </>

apps/mail/components/create/email-composer.tsx

@@ -15,7 +15,7 @@ import {
 } from '@/components/ui/select';
 
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
-import { Check, Command, Loader, Paperclip, Plus, Type, X as XIcon } from 'lucide-react';
+import { Check, Command, Loader, Paperclip, Trash, Plus, Type, X as XIcon } from 'lucide-react';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
 import { TextEffect } from '@/components/motion-primitives/text-effect';
 import { ImageCompressionSettings } from './image-compression-settings';
@@ -35,7 +35,7 @@ import { useMutation } from '@tanstack/react-query';
 import { useSettings } from '@/hooks/use-settings';
 
 import { cn, formatFileSize } from '@/lib/utils';
-import { useThread } from '@/hooks/use-threads';
+import { useThread, useThreads } from '@/hooks/use-threads';
 import { serializeFiles } from '@/lib/schemas';
 import { Input } from '@/components/ui/input';
 import { EditorContent } from '@tiptap/react';
@@ -75,6 +75,7 @@ interface EmailComposerProps {
     fromEmail?: string;
   }) => Promise<void>;
   onClose?: () => void;
+  onDraftUpdate?: () => void;
   className?: string;
   autofocus?: boolean;
   settingsLoading?: boolean;
@@ -112,6 +113,8 @@ export function EmailComposer({
   initialAttachments = [],
   onSendEmail,
   onClose,
+  onDraftUpdate,
+  // onDeleteDrafts,
   className,
   autofocus = false,
   settingsLoading = false,
@@ -123,6 +126,8 @@ export function EmailComposer({
   const [showBcc, setShowBcc] = useState(initialBcc.length > 0);
   const [isLoading, setIsLoading] = useState(false);
   const [isSavingDraft, setIsSavingDraft] = useState(false);
+  const [isDeleteDraft, setIsDeleteDraft] = useState(false);
+  const [{ isFetching, refetch: refetchThreads }] = useThreads();
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
   const [messageLength, setMessageLength] = useState(0);
   const fileInputRef = useRef<HTMLInputElement>(null);
@@ -253,6 +258,8 @@ export function EmailComposer({
   const trpc = useTRPC();
   const { mutateAsync: aiCompose } = useMutation(trpc.ai.compose.mutationOptions());
   const { mutateAsync: createDraft } = useMutation(trpc.drafts.create.mutationOptions());
+  const {mutateAsync: updateDraft} = useMutation(trpc.drafts.update.mutationOptions());
+  const {mutateAsync: deleteDraft} = useMutation(trpc.drafts.delete.mutationOptions());
   const { mutateAsync: generateEmailSubject } = useMutation(
     trpc.ai.generateEmailSubject.mutationOptions(),
   );
@@ -553,6 +560,8 @@ export function EmailComposer({
     }
   };
 
+
+
   const saveDraft = async () => {
     const values = getValues();
 
@@ -578,11 +587,37 @@ export function EmailComposer({
         fromEmail: values.fromEmail ? values.fromEmail : null,
       };
 
-      const response = await createDraft(draftData);
-
-      if (response?.id && response.id !== draftId) {
-        setDraftId(response.id);
-      }
+      if(draftId){
+        try{
+          const response = await updateDraft(draftData);
+          if(response?.id){
+            setDraftId(response?.id);
+            onDraftUpdate?.();
+            toast.success("Your Draft has been Successfully Saved")
+        } 
+          else{
+            console.error("Failed Setting up Draft Id")
+            toast.error("Failed Setting up Draft Id")
+        }
+        } catch(error){
+          console.error("Failed to create draft:",error)
+          toast.error("Failed to create draft")
+        }
+      } else {
+          try{
+            const response = await createDraft(draftData);
+            if(response?.id){
+              setDraftId(response?.id);
+              toast.success("Your Draft has been Successfully Saved")
+            } else{
+              console.error("Failed Setting up Draft Id")
+              toast.error("Failed Setting up Draft Id")
+            }
+          }catch (error) {
+              console.error("Failed to create draft:", error);
+              toast.error("Failed to create draft");
+          }
+    }
     } catch (error) {
       console.error('Error saving draft:', error);
       toast.error('Failed to save draft');
@@ -594,6 +629,48 @@ export function EmailComposer({
     }
   };
 
+  useEffect(() => {
+    if (!hasUnsavedChanges) return;
+
+    const autoSaveTimer = setTimeout(() => {
+      saveDraft();
+    }, 3000);
+
+    return () => clearTimeout(autoSaveTimer);
+  }, [hasUnsavedChanges]);
+
+
+  const handleDeleteDraft = async () => {
+    if (!draftId) {
+      toast.error('No draft Id available to delete the draft.');
+      return;
+    }
+    try{
+      const response = await deleteDraft({id: draftId});
+      if(response === ''){
+          setDraftId(null); 
+          setIsComposeOpen(null);
+          setTimeout(() => {
+            toast.success("Successfully Deleted Draft");
+            refetchThreads();
+        }, 500);
+      } 
+    } catch (error) {
+      console.error('Failed to delete draft:', error);
+      toast.error('Failed to delete draft.');
+    }
+  };
+  // this handleclose button triggeres to auto-save draft upon close 
+  const handleClose = () => {
+    const hasContent = editor?.getText()?.trim().length > 0;
+    if (hasContent) {
+      saveDraft();
+      setShowLeaveConfirmation(true);
+    } else {
+      onClose?.();
+    }
+  };
+
   const handleGenerateSubject = async () => {
     try {
       setIsGeneratingSubject(true);
@@ -615,17 +692,10 @@ export function EmailComposer({
     }
   };
 
-  const handleClose = () => {
-    const hasContent = editor?.getText()?.trim().length > 0;
-    if (hasContent) {
-      setShowLeaveConfirmation(true);
-    } else {
-      onClose?.();
-    }
-  };
 
   const confirmLeave = () => {
     setShowLeaveConfirmation(false);
+    handledeleteDraft();
     onClose?.();
   };
 
@@ -646,16 +716,6 @@ export function EmailComposer({
     };
   }, [editor, showLeaveConfirmation]);
 
-  useEffect(() => {
-    if (!hasUnsavedChanges) return;
-
-    const autoSaveTimer = setTimeout(() => {
-      console.log('timeout set');
-      saveDraft();
-    }, 3000);
-
-    return () => clearTimeout(autoSaveTimer);
-  }, [hasUnsavedChanges, saveDraft]);
 
   useEffect(() => {
     const handlePasteFiles = (event: ClipboardEvent) => {
@@ -923,7 +983,7 @@ export function EmailComposer({
                   tabIndex={-1}
                   className="flex h-full items-center gap-2 text-sm font-medium text-[#8C8C8C] hover:text-[#A8A8A8]"
                   onClick={handleClose}
-                >
+                > 
                   <X className="h-3.5 w-3.5 fill-[#9A9A9A]" />
                 </button>
               )}
@@ -1480,7 +1540,7 @@ export function EmailComposer({
             </TooltipProvider>
           </div>
         </div>
-        <div className="flex items-start justify-start gap-2">
+        <div className="flex items-start justify-start gap-4">
           <div className="relative">
             <AnimatePresence>
               {aiGeneratedMessage !== null ? (
@@ -1579,7 +1639,7 @@ export function EmailComposer({
               Stay
             </Button>
             <Button variant="destructive" onClick={confirmLeave}>
-              Leave
+              <Trash className='w-5 h-5 rounded-md'/>Discard
             </Button>
           </DialogFooter>
         </DialogContent>