continued dialog changes

Author: safipatel

app/classroom/[classroomId]/manage/buttons.tsx

@@ -245,7 +245,7 @@ export default function ClassroomManagementButtons({
 
       {classroomInfo.Classroom_Members &&
         classroomInfo.Classroom_Members.length > 0 && (
-          <MemberList classroom={classroomInfo} enableDeletion={true} />
+          <MemberList classroom={classroomInfo} enableDeletion={true} userId={userAndClassData.userData.id}/>
         )}
       <p>Invite Member:</p>
       <InviteMember classroomId={classroomId} />

app/classroom/classroomList.tsx

@@ -40,7 +40,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 
-import { useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { toast } from "@/hooks/use-toast";
 import { Edit, LogOut, MessageSquareMore, Trash2, Users } from "lucide-react";
 import { SheetTrigger } from "@/components/ui/sheet";
@@ -50,6 +50,8 @@ import { Input } from "@/components/ui/input";
 
 export default function ClassroomList() {
   const searchParams = useSearchParams();
+  const router = useRouter();
+
   const [isDialogOpen, setIsDialogOpen] = useState(false);
   const [newClassName, setNewClassName] = useState("");
 
@@ -89,25 +91,27 @@ export default function ClassroomList() {
       setUserAndClassData(refreshedData);
     }
   };
-//   useEffect(() => {
-//   const joinedClassSuccess = searchParams.get("join_success");
-//   if (joinedClassSuccess && !isNaN(Number(joinedClassSuccess))) {
-//     const joinClassInfo = userAndClassData.classroomsData.find(
-//       (x) => x.id === Number(joinedClassSuccess)
-//     );
-//     if (joinClassInfo) {
-//       refreshClassrooms();
-//       toast({
-//         description: (
-//           <div>
-//             Successfully joined classroom
-//             <span className="font-bold"> {joinClassInfo.name}</span>!
-//           </div>
-//         ),
-//         duration: 10000,
-//       });
-//     }
-//   }
+  
+  const joinedClassSuccess = searchParams.get("join_success");
+  if (joinedClassSuccess && !isNaN(Number(joinedClassSuccess))) {
+    const joinClassInfo = userAndClassData.classroomsData.find(
+      (x) => x.id === Number(joinedClassSuccess)
+    );
+    if (joinClassInfo) {
+      // Join class doesn't need to refresh classroom data since we know its fresh 
+      // since it's coming from a redirect from a reoute
+      toast({
+        description: (
+          <div>
+            Successfully joined classroom
+            <span className="font-bold"> {joinClassInfo.name}</span>!
+          </div>
+        ),
+        duration: 10000,
+      });
+      router.replace("/classroom", {scroll: false})
+    }
+  }
 
 //   const deleteClassSuccess = searchParams.get("delete_success");
 
@@ -236,6 +240,7 @@ export default function ClassroomList() {
                                 </Tooltip>
                               </TooltipProvider>
                             }
+                            userId={userId}
                           />
                         )}
                       {!isAdmin && (

app/classroom/clientUtils.ts

@@ -18,23 +18,22 @@ import {
 export const optimisticUpdateAndFetchClassroomData = async <
   K extends keyof ClassroomWithMembers,
 >(
-  classroomId: number,
   action: () => Promise<unknown>,
-  newValue: { [k in K]: ClassroomWithMembers[k] } | "remove",
+  newValue: { [k in K]: ClassroomWithMembers[k] } | ClassroomWithMembers | "remove",
   setUserAndClassDataFunction: React.Dispatch<
     React.SetStateAction<UserWithClassroomsData>
   >,
+  classroomId?: number,
   refreshFunction?: () => Promise<unknown>
 ) => {
   setUserAndClassDataFunction((prevData) => ({
     userData: prevData.userData,
     classroomsData: prevData.classroomsData.flatMap((classroom) => {
-      console.log(classroom.name);
       if (classroom.id === classroomId) {
         return newValue === "remove" ? [] : { ...classroom, ...newValue };
       }
       return classroom;
-    }),
+    }).concat(typeof newValue === 'object' && "id" in newValue ? newValue : [] ),
   }));
   const returnVal = await action();
   if (refreshFunction) {

app/classroom/memberList.tsx

@@ -30,14 +30,16 @@ import { getCurrentUserId, removeMember } from "./actions";
  */
 export default function MemberList({
   classroom,
+  userId,
   enableDeletion,
   triggerButton,
-}: {
+} : {
   classroom: ClassroomWithMembers;
+  userId: string
+
   enableDeletion: boolean;
   triggerButton?: ReactNode;
 }) {
-  const [adminId, setAdminId] = useState<string | null>(null);
   const [members, setMembers] = useState<Tables<"Users">[]>([]);
 
   useEffect(() => {
@@ -46,14 +48,6 @@ export default function MemberList({
     }
   }, [classroom.Classroom_Members]);
 
-  useEffect(() => {
-    const fetchAdminId = async () => {
-      const id = await getCurrentUserId();
-      setAdminId(id);
-    };
-
-    fetchAdminId();
-  }, []); // Fetch once when the component mounts
 
   if (!classroom.Classroom_Members) {
     return <h1>No members found!</h1>;
@@ -105,7 +99,7 @@ export default function MemberList({
                         id: "actions",
                         cell: ({ row }: { row: Row<Tables<"Users">> }) => {
                           // const adminId = getCurrentUserId();
-                          const isAdmin = row.original.id === adminId; // Check if the current row is the admin
+                          const isAdmin = row.original.id === userId; // Check if the current row is the admin
 
                           // Only render the delete button if the current row is NOT the admin
                           if (isAdmin) {