adding reset Users (#236)

* adding reset Users

* changes done as per review

Author: LijuJacob08

src/hooks/useChapterAssignment.ts

@@ -3,10 +3,14 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { config } from '@/lib/config';
 import { type ChapterAssignmentProgress, type UserChapterAssignment } from '@/lib/types';
 
+export interface AssignSelectedItem {
+  chapterAssignmentId: number;
+  drafterId: number | null;
+  peerCheckerId: number | null;
+}
+
 export interface AssignChapterPayload {
-  chapterAssignmentId: number[];
-  userId: number;
-  peerCheckerId?: number;
+  assignments: AssignSelectedItem[];
 }
 
 export interface ChapterAssignmentsByUser {
@@ -47,35 +51,28 @@ const fetchChapterAssignmentsByUserId = async (
   return (await res.json()) as ChapterAssignmentsByUser;
 };
 
-export interface AssignChaptersResponse {
-  success: boolean;
-  message?: string;
-  assignedUser?: string;
-  peerChecker?: string;
-}
-
 const assignChaptersToUser = async (
-  payload: AssignChapterPayload & { email: string }
-): Promise<number[]> => {
-  const { email, userId, chapterAssignmentId, peerCheckerId } = payload;
-
-  const response = await fetch(`${config.api.url}/users/${userId}/chapter-assignments`, {
-    method: 'PATCH',
-    headers: {
-      'Content-Type': 'application/json',
-      'x-user-email': email,
-    },
-    body: JSON.stringify({
-      chapterAssignmentIds: chapterAssignmentId,
-      peerCheckerId: peerCheckerId,
-    }),
-  });
+  payload: AssignChapterPayload & { email: string; projectId: string }
+): Promise<UserChapterAssignment[]> => {
+  const { email, projectId, assignments } = payload;
+
+  const response = await fetch(
+    `${config.api.url}/projects/${projectId}/chapter-assignments/assign-selected`,
+    {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-user-email': email,
+      },
+      body: JSON.stringify({ assignments }),
+    }
+  );
 
   if (!response.ok) {
     throw new Error('Failed to assign chapters');
   }
 
-  return (await response.json()) as number[];
+  return (await response.json()) as UserChapterAssignment[];
 };
 
 export const useChapterAssignments = (projectId: string, email: string) => {
@@ -117,21 +114,23 @@ export const useAssignChapters = (
 
       if (previousAssignments) {
         const updatedAssignments = previousAssignments.map(assignment => {
-          if (variables.chapterAssignmentId.includes(assignment.assignmentId)) {
-            return {
-              ...assignment,
-              ...(assignedUserName &&
-                variables.userId && {
-                  assignedUser: { id: variables.userId, displayName: assignedUserName },
-                }),
-              ...(peerCheckerName &&
-                variables.peerCheckerId && {
-                  peerChecker: { id: variables.peerCheckerId, displayName: peerCheckerName },
-                }),
-              status: assignment.status === 'not_started' ? 'draft' : assignment.status,
-            };
-          }
-          return assignment;
+          const item = variables.assignments.find(
+            a => a.chapterAssignmentId === assignment.assignmentId
+          );
+          if (!item) return assignment;
+
+          return {
+            ...assignment,
+            assignedUser:
+              item.drafterId !== null && assignedUserName
+                ? { id: item.drafterId, displayName: assignedUserName }
+                : null,
+            peerChecker:
+              item.peerCheckerId !== null && peerCheckerName
+                ? { id: item.peerCheckerId, displayName: peerCheckerName }
+                : null,
+            status: assignment.status === 'not_started' ? 'draft' : assignment.status,
+          };
         });
 
         queryClient.setQueryData(['chapterAssignments', projectId, email], updatedAssignments);
@@ -140,7 +139,6 @@ export const useAssignChapters = (
       return { previousAssignments };
     },
     onError: (_err, _variables, context) => {
-      // Rollback on error
       if (context?.previousAssignments) {
         queryClient.setQueryData(
           ['chapterAssignments', projectId, email],
@@ -153,8 +151,16 @@ export const useAssignChapters = (
         queryKey: ['chapterAssignments', projectId, email],
       });
 
-      void queryClient.invalidateQueries({
-        queryKey: ['userChapterAssignments', variables.userId],
+      // Invalidate user assignment caches for every unique user touched
+      const affectedUserIds = new Set<number>();
+      variables.assignments.forEach(a => {
+        if (a.drafterId !== null) affectedUserIds.add(a.drafterId);
+        if (a.peerCheckerId !== null) affectedUserIds.add(a.peerCheckerId);
+      });
+      affectedUserIds.forEach(userId => {
+        void queryClient.invalidateQueries({
+          queryKey: ['userChapterAssignments', userId],
+        });
       });
 
       void queryClient.invalidateQueries({

src/layouts/projects/AssignUsersDialog.tsx

@@ -116,6 +116,21 @@ export const AssignUsersDialog: React.FC<AssignUsersDialogProps> = ({
   const hasCompleteStatus = selectedAssignmentsStatuses.some(
     status => status === ChapterAssignmentStatus.COMPLETE
   );
+  const isFormEmpty = !selectedDrafter && !selectedPeerChecker;
+  const hasCompleteSelection = !!selectedDrafter && !!selectedPeerChecker;
+  const isDraftingComplete = selectedAssignmentsStatuses.some(
+    status =>
+      status !== ChapterAssignmentStatus.NOT_STARTED && status !== ChapterAssignmentStatus.DRAFT
+  );
+  const isResetDisabled = isFormEmpty || isDraftingComplete || usersLoading || isAssigning;
+
+  const canSubmit = isFormEmpty || hasCompleteSelection;
+  const isSubmitDisabled = !canSubmit || usersLoading || isAssigning;
+
+  const handleReset = () => {
+    onDrafterChange('');
+    onPeerCheckerChange('');
+  };
 
   const isDrafterDisabled =
     hasPeerCheckStatus ||
@@ -231,15 +246,17 @@ export const AssignUsersDialog: React.FC<AssignUsersDialogProps> = ({
         </div>
 
         <DialogFooter className='flex gap-2'>
-          <Button
-            disabled={!selectedDrafter || !selectedPeerChecker || usersLoading || isAssigning}
-            onClick={onAssign}
-          >
+          <Button disabled={isResetDisabled} onClick={handleReset}>
+            Reset Users
+          </Button>
+          <Button disabled={isSubmitDisabled} onClick={onAssign}>
             {isAssigning ? (
               <>
                 <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                Assigning...
+                {isFormEmpty ? 'Unassigning...' : 'Assigning...'}{' '}
               </>
+            ) : isFormEmpty ? (
+              'Unassign Users'
             ) : (
               'Assign Users'
             )}

src/layouts/projects/ProjectDetailPage.tsx

@@ -386,39 +386,55 @@ export const ProjectDetailPage: React.FC<ProjectDetailPageProps> = ({
   }, [selectedAssignments, chapterAssignments, projectUsers]);
 
   const handleAssignUser = useCallback(async () => {
-    if (selectedDrafter && selectedAssignments.length > 0 && userdetail?.email) {
-      try {
-        await assignChapterMutation.mutateAsync({
-          chapterAssignmentId: selectedAssignments,
-          userId: parseInt(selectedDrafter),
-          peerCheckerId: parseInt(selectedPeerChecker),
-          email: userdetail.email,
-        });
-
-        setIsRefreshingAfterAssignment(true);
-
-        setSelectedDrafter('');
-        setSelectedPeerChecker('');
-        setSelectedAssignments([]);
-        setSelectedAssignmentsStatuses([]);
-        setIsDialogOpen(false);
-      } catch (error) {
-        Logger.logException(error, { context: 'Error Assigning Chapters' });
-        setIsRefreshingAfterAssignment(false);
-      }
+    const drafterId = selectedDrafter === '' ? null : parseInt(selectedDrafter);
+    const peerCheckerId = selectedPeerChecker === '' ? null : parseInt(selectedPeerChecker);
+    const isUnassigning = drafterId === null && peerCheckerId === null;
+    const canProceed =
+      (drafterId !== null || isUnassigning) &&
+      selectedAssignments.length > 0 &&
+      userdetail?.email &&
+      projectId;
+
+    if (!canProceed) return;
+
+    try {
+      await assignChapterMutation.mutateAsync({
+        projectId: projectId.toString(),
+        email: userdetail.email,
+        assignments: selectedAssignments.map(id => ({
+          chapterAssignmentId: id,
+          drafterId,
+          peerCheckerId,
+        })),
+      });
+
+      setIsRefreshingAfterAssignment(true);
+      setSelectedDrafter('');
+      setSelectedPeerChecker('');
+      setSelectedAssignments([]);
+      setSelectedAssignmentsStatuses([]);
+      setIsDialogOpen(false);
+    } catch (error) {
+      Logger.logException(error, { context: 'Error Assigning/Unassigning Chapters' });
+      setIsRefreshingAfterAssignment(false);
     }
   }, [
     selectedDrafter,
     selectedPeerChecker,
     selectedAssignments,
     userdetail?.email,
+    projectId,
     assignChapterMutation,
   ]);
 
   const handleCheckboxChange = useCallback((assignmentId: number, checked: boolean) => {
-    setSelectedAssignments(prev =>
-      checked ? [...prev, assignmentId] : prev.filter(id => id !== assignmentId)
-    );
+    setSelectedAssignments(prev => {
+      if (checked) {
+        return prev.includes(assignmentId) ? prev : [...prev, assignmentId];
+      } else {
+        return prev.filter(id => id !== assignmentId);
+      }
+    });
   }, []);
 
   if (isRefreshingAfterAssignment && !assignmentsFetching) {