Merge pull request #77 from uwblueprint/colin/edit-email-subs

Admin Dashboard: Edit Email Subscriptions

Author: ChinemeremChigbo

app/api/users/[id]/route.ts

@@ -18,11 +18,30 @@ export async function GET(
 
   const searchParams = request.nextUrl.searchParams;
   const getAbsences = searchParams.get('getAbsences') === 'true';
+  const getMailingLists = searchParams.get('getMailingLists') === 'true';
 
   try {
     const user = await prisma.user.findUnique({
       where: { id: validatedId },
-      include: { absences: getAbsences },
+      include: {
+        absences: getAbsences,
+        mailingLists: getMailingLists
+          ? {
+              include: {
+                subject: {
+                  select: {
+                    id: true,
+                    name: true,
+                    abbreviation: true,
+                    colorGroup: {
+                      select: { colorCodes: true },
+                    },
+                  },
+                },
+              },
+            }
+          : false,
+      },
     });
 
     if (!user) {
@@ -50,12 +69,79 @@ export async function PATCH(
   }
 
   try {
-    const { email, firstName, lastName, role } = await request.json();
+    const { email, firstName, lastName, role, mailingListSubjectIds } =
+      await request.json();
 
-    const updatedUser = await prisma.user.update({
-      where: { id: validatedId },
-      data: { email, firstName, lastName, role },
-    });
+    // Update basic user data if provided
+    const userData: any = {};
+    if (email !== undefined) userData.email = email;
+    if (firstName !== undefined) userData.firstName = firstName;
+    if (lastName !== undefined) userData.lastName = lastName;
+    if (role !== undefined) userData.role = role;
+
+    let updatedUser;
+
+    // If mailingListSubjectIds is provided, we need to update the mailing lists
+    if (mailingListSubjectIds !== undefined) {
+      if (!Array.isArray(mailingListSubjectIds)) {
+        return NextResponse.json(
+          { error: 'mailingListSubjectIds must be an array' },
+          { status: 400 }
+        );
+      }
+
+      // First update the user data
+      updatedUser = await prisma.user.update({
+        where: { id: validatedId },
+        data: userData,
+      });
+
+      // Then delete all existing mailing lists for this user
+      await prisma.mailingList.deleteMany({
+        where: { userId: validatedId },
+      });
+
+      // Then create new entries for each subject ID
+      if (mailingListSubjectIds.length > 0) {
+        const mailingListData = mailingListSubjectIds.map((subjectId) => ({
+          userId: validatedId,
+          subjectId,
+        }));
+
+        await prisma.mailingList.createMany({
+          data: mailingListData,
+        });
+      }
+
+      // Return the updated user with mailing lists
+      updatedUser = await prisma.user.findUnique({
+        where: { id: validatedId },
+        include: {
+          mailingLists: {
+            include: {
+              subject: {
+                select: {
+                  id: true,
+                  name: true,
+                  abbreviation: true,
+                  colorGroup: {
+                    select: {
+                      colorCodes: true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
+    } else {
+      // Just update user data without touching mailing lists
+      updatedUser = await prisma.user.update({
+        where: { id: validatedId },
+        data: userData,
+      });
+    }
 
     return NextResponse.json(updatedUser);
   } catch (error) {

app/api/users/route.ts

@@ -16,6 +16,7 @@ export async function GET(request: NextRequest) {
                   select: {
                     name: true,
                     abbreviation: true,
+                    archived: true,
                     colorGroup: {
                       select: { colorCodes: true },
                     },

src/components/EditableRoleCell.tsx

@@ -133,7 +133,12 @@ const EditableRoleCell = ({ role, onRoleChange }: EditableRoleCellProps) => {
                   color="neutralGray.600"
                 />
               ) : (
-                isHovered && <Icon as={FiEdit2} color="neutralGray.600" />
+                <Icon
+                  as={FiEdit2}
+                  color="neutralGray.600"
+                  opacity={isHovered ? 1 : 0}
+                  transition="opacity 0.3s ease-in-out"
+                />
               )}
             </Box>
           </Box>