fix(authActions): enhance error handling in registerUser function for better feedback

fix(messageActions): update getMessagesByContainer to allow dynamic limit and fix cursor comparison
fix(MessageTable): pass loadMoreLimit prop to useMessages for consistent message loading
fix(page): adjust message loading logic to utilize loadMoreLimit for pagination
fix(useMessages): refactor loadMore function to improve cursor handling and message retrieval
fix(util): improve error handling in handleFormServerErrors for root-level server errors

Author: rootcode-creator

src/app/actions/authActions.ts

@@ -7,7 +7,7 @@ import { LoginSchema } from '@/lib/schemas/LoginSchema';
 import { combinedRegisterSchema, ProfileSchema, registerSchema, RegisterSchema } from '@/lib/schemas/RegisterSchema';
 import { deleteTokenById, generateToken, getTokenByToken } from '@/lib/tokens';
 import { ActionResult } from '@/types';
-import { User } from '@prisma/client';
+import { Prisma, User } from '@prisma/client';
 import bcrypt from 'bcryptjs';
 import { AuthError } from 'next-auth';
 
@@ -114,8 +114,35 @@ export async function registerUser(data:RegisterSchema): Promise<ActionResult<Us
 
 
     }catch(error){
-        console.error( error);
-        return{status: 'error', error: 'Something went wrong'}
+        console.error('registerUser failed', error);
+
+        if (error instanceof Prisma.PrismaClientKnownRequestError) {
+            if (error.code === 'P2002') {
+                const target = Array.isArray(error.meta?.target)
+                    ? error.meta.target.map((item) => String(item))
+                    : [];
+
+                if (target.includes('email')) {
+                    return {
+                        status: 'error',
+                        error: [
+                            {
+                                code: 'custom',
+                                message: 'Email is already registered',
+                                path: ['email']
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        const message = error instanceof Error ? error.message : 'Unknown error';
+
+        return {
+            status: 'error',
+            error: shouldExposeError ? message : 'Something went wrong'
+        }
     }
 }
 

src/app/actions/messageActions.ts

@@ -222,7 +222,7 @@ export async function getMessageThread(recipientId: string) {
 }
 
 
-export async function getMessagesByContainer(container?: string|null,cursor?:string, limit=4){
+export async function getMessagesByContainer(container?: string|null,cursor?:string, limit=5){
 
     try {
 
@@ -231,7 +231,7 @@ export async function getMessagesByContainer(container?: string|null,cursor?:str
         const conditions = {
             [container ==='outbox'? 'senderId': 'recipientId']: userId,
             ...(container === 'outbox'? {senderDeleted: false}:{recipientDeleted:false} ),
-            ...(cursor? {created: {lte:new Date(cursor)}} : {})
+            ...(cursor? {created: {lt:new Date(cursor)}} : {})
 
         }
 

src/app/favicon.ico

@@ -24,6 +24,7 @@ import MessageTableCell from "./MessageTableCell";
 type Props = {
     initialMessages: MessageDto[];
     nextCursor?: string;
+  loadMoreLimit?: number;
 };
 
 const outboxColumns = [
@@ -42,10 +43,11 @@ const inboxColumns = [
 
 export default function MessageTable({ initialMessages,
      nextCursor,
+  loadMoreLimit,
 }: Props) {
 
 
-    const {columns, isOutbox, isDeleting, deleteMessage, selectRow, messages, loadMore, loadingMore, hasMore}= useMessages(initialMessages, nextCursor);
+    const {columns, isOutbox, isDeleting, deleteMessage, selectRow, messages, loadMore, loadingMore, hasMore}= useMessages(initialMessages, nextCursor, loadMoreLimit);
 
 
 

src/app/messages/MessageTable.tsx

@@ -10,13 +10,18 @@ export default async function MessagesPage({
 }: {
   searchParams: Promise<{ container?: string }>;
 }) {
+  const INITIAL_MESSAGES_LIMIT = 5;
+  const LOAD_MORE_MESSAGES_LIMIT = 2;
+
   const { container } = await searchParams;
   const normalizedContainer =
     container === "outbox" ? "outbox" : "inbox";
 
 
   const {messages, nextCursor} = await getMessagesByContainer(
-    normalizedContainer 
+    normalizedContainer,
+    undefined,
+    INITIAL_MESSAGES_LIMIT
   );
 
 
@@ -34,7 +39,11 @@ export default async function MessagesPage({
 
       <div className="col-span-10">
 
-        <MessageTable initialMessages={messages} nextCursor={nextCursor} />
+        <MessageTable
+          initialMessages={messages}
+          nextCursor={nextCursor}
+          loadMoreLimit={LOAD_MORE_MESSAGES_LIMIT}
+        />
       </div>
     </div>
   );

src/app/messages/page.tsx

@@ -27,7 +27,8 @@ const inboxColumns = [
 
 export const useMessages = (
   initialMessages: MessageDto[],
-  nextCursor?: string
+  nextCursor?: string,
+  loadMoreLimit = 2
 ) => {
   const set = useMessageStore((state) => state.set);
   const remove = useMessageStore((state) => state.remove);
@@ -39,13 +40,11 @@ export const useMessages = (
     (state) => state.resetMessages
   );
 
-
-  const cursorRef = useRef(nextCursor);
-
-
   const searchParams = useSearchParams();
   const router = useRouter();
   const container = searchParams.get("container");
+  const normalizedContainer =
+    container === "outbox" ? "outbox" : "inbox";
   const isOutbox =
     searchParams.get("container") === "outbox";
   const [isDeleting, setDeleting] = useState({
@@ -54,30 +53,33 @@ export const useMessages = (
   });
 
   const [loadingMore, setLoadingMore] = useState(false);
+  const [cursor, setCursor] = useState(nextCursor);
 
   useEffect(() => {
+    resetMessages();
     set(initialMessages);
-
-    return () => {
-      resetMessages();
-    };
-  }, [initialMessages, resetMessages, set]);
+    setCursor(nextCursor);
+  }, [initialMessages, nextCursor, normalizedContainer, resetMessages, set]);
 
 
 const loadMore = useCallback(async () => {
-  if(cursorRef.current){
+  if(cursor){
     setLoadingMore(true);
-    const {messages, nextCursor} = 
-    await getMessagesByContainer(
-      container,
-      cursorRef.current
-    );
-
-    set(messages);
-    cursorRef.current = nextCursor;
-    setLoadingMore(false);
+    try {
+      const {messages, nextCursor} = 
+      await getMessagesByContainer(
+        normalizedContainer,
+        cursor,
+        loadMoreLimit
+      );
+
+      set(messages);
+      setCursor(nextCursor);
+    } finally {
+      setLoadingMore(false);
+    }
   }
-}, [container, set]);
+}, [cursor, loadMoreLimit, normalizedContainer, set]);
 
 
 
@@ -122,6 +124,6 @@ const loadMore = useCallback(async () => {
     messages,
     loadingMore,
     loadMore,
-    hasMore:!!cursorRef.current,
+    hasMore:!!cursor,
   };
 };

src/hooks/useMessages.tsx

@@ -21,6 +21,11 @@ export function handleFormServerErrors<TFieldValues extends FieldValues>(
     if (Array.isArray(errorResponse.error)) {
 
         errorResponse.error.forEach((e) => {
+        if (e.path.length === 0) {
+            setError('root.serverError', { message: e.message });
+            return;
+        }
+
         const fieldName = e.path.join('.') as Path<TFieldValues>
         setError(fieldName, { message: e.message })