format

MatiasSinisalo · MatiasSinisalo · commit 77b8e8263938 · 2025-08-11T13:39:36.000+03:00
diff --git a/src/client/components/Admin/UserSearch.tsx b/src/client/components/Admin/UserSearch.tsx
@@ -108,9 +108,18 @@ const UserTable = ({ users }: { users: User[] }) => {
   )
 }
 
-
-const ActionUserTable = ({ users, onSelect, actionText, actionButtonText }: { users: User[], onSelect: (user: User) => void, actionText: string, actionButtonText: string }) => {
- const { t } = useTranslation()
+const ActionUserTable = ({
+  users,
+  onSelect,
+  actionText,
+  actionButtonText,
+}: {
+  users: User[]
+  onSelect: (user: User) => void
+  actionText: string
+  actionButtonText: string
+}) => {
+  const { t } = useTranslation()
 
   if (!users || users.length === 0) return null
 
@@ -145,13 +154,13 @@ const ActionUserTable = ({ users, onSelect, actionText, actionButtonText }: { us
                   <b>{t('admin:email')}</b>
                 </Typography>
               </TableCell>
-             <TableCell />
-               <TableCell align="left">
+              <TableCell />
+              <TableCell align="left">
                 <Typography variant="h6">
                   <b>{actionText}</b>
                 </Typography>
               </TableCell>
-             <TableCell />
+              <TableCell />
             </TableRow>
           </TableHead>
           <TableBody>
@@ -172,11 +181,16 @@ const ActionUserTable = ({ users, onSelect, actionText, actionButtonText }: { us
                 <TableCell align="left">
                   <Typography variant="h6">{user.primaryEmail}</Typography>
                 </TableCell>
-               <TableCell>
-                 <Button variant="outlined" onClick={() => {onSelect(user)}}>
-                  {actionButtonText}
-              </Button>
-             </TableCell>
+                <TableCell>
+                  <Button
+                    variant="outlined"
+                    onClick={() => {
+                      onSelect(user)
+                    }}
+                  >
+                    {actionButtonText}
+                  </Button>
+                </TableCell>
               </TableRow>
             ))}
           </TableBody>
@@ -208,7 +222,15 @@ const UserSearch = () => {
   )
 }
 //a component which allows users to be searched in order to perform some kind of action with the user
-export const ActionUserSearch = ({onSelect, actionText, actionButtonText}: {onSelect: (user: User) => void, actionText: string, actionButtonText: string}) => {
+export const ActionUserSearch = ({
+  onSelect,
+  actionText,
+  actionButtonText,
+}: {
+  onSelect: (user: User) => void
+  actionText: string
+  actionButtonText: string
+}) => {
   const [search, setSearch] = useState('')
   const { users, isLoading, refetch } = useUserSearch(search)
   const { t } = useTranslation()
@@ -226,7 +248,7 @@ export const ActionUserSearch = ({onSelect, actionText, actionButtonText}: {onSe
       {search.length > 2 && search.length < 5 && <div>{t('admin:typeMore')}</div>}
 
       {isLoading && <div>Loading...</div>}
-      {users && <ActionUserTable users={users} onSelect={onSelect} actionText={actionText} actionButtonText={actionButtonText}/>}
+      {users && <ActionUserTable users={users} onSelect={onSelect} actionText={actionText} actionButtonText={actionButtonText} />}
     </Box>
   )
 }
diff --git a/src/client/components/Courses/Course/index.tsx b/src/client/components/Courses/Course/index.tsx
@@ -1,5 +1,21 @@
 import { Edit, OpenInNew } from '@mui/icons-material'
-import { Alert, Box, Button, Checkbox, Container, FormControlLabel, Input, Modal, Paper, Skeleton, Stack, Tab, TextField, Tooltip, Typography } from '@mui/material'
+import {
+  Alert,
+  Box,
+  Button,
+  Checkbox,
+  Container,
+  FormControlLabel,
+  Input,
+  Modal,
+  Paper,
+  Skeleton,
+  Stack,
+  Tab,
+  TextField,
+  Tooltip,
+  Typography,
+} from '@mui/material'
 import { enqueueSnackbar } from 'notistack'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -43,7 +59,7 @@ const Course = () => {
     return <ApiErrorView error={error} />
   }
   useEffect(() => {
-    if(isCourseSuccess){
+    if (isCourseSuccess) {
       setResponsibilities(course?.responsibilities)
     }
   }, [isCourseSuccess])
@@ -109,16 +125,15 @@ const Course = () => {
   const handleAddResponsible = async (user: User) => {
     const username = user.username
     const result = await apiClient.post(`/courses/${course.id}/responsibilities/assign`, { username: username })
-    if(result.status === 200){
+    if (result.status === 200) {
       const responsibility = result.data
       setResponsibilities([...responsibilities, responsibility])
       refetchCourse()
     }
-
   }
   const handleRemoveResponsibility = async (responsibility) => {
     const result = await apiClient.post(`/courses/${course.id}/responsibilities/remove`, { username: responsibility.user?.username })
-    if(result.status === 200){
+    if (result.status === 200) {
       const filteredResponsibilities = responsibilities.filter((r) => r.id !== responsibility.id)
       setResponsibilities(filteredResponsibilities)
     }
@@ -208,12 +223,25 @@ const Course = () => {
               </Button>
               {showTeachers && (
                 <Box>
-                    <Button onClick = {() => {setAddTeacherViewOpen(true)}}>{t('course:add')}</Button>
-                  <Stack sx={{margin: 1, padding: 1, borderColor: 'gray', borderWidth: 1, borderStyle: 'solid'}}>
+                  <Button
+                    onClick={() => {
+                      setAddTeacherViewOpen(true)
+                    }}
+                  >
+                    {t('course:add')}
+                  </Button>
+                  <Stack sx={{ margin: 1, padding: 1, borderColor: 'gray', borderWidth: 1, borderStyle: 'solid' }}>
                     {responsibilities.map((responsibility) => (
-                      <Box  key={responsibility.id} sx={{display: 'flex', alignItems: 'center', padding: 1}}>
-                        <Typography>{responsibility.user.last_name} {responsibility.user.first_names}</Typography>
-                        <AssignedResponsibilityManagement handleRemove={() => {handleRemoveResponsibility(responsibility)}} responsibility={responsibility}/>
+                      <Box key={responsibility.id} sx={{ display: 'flex', alignItems: 'center', padding: 1 }}>
+                        <Typography>
+                          {responsibility.user.last_name} {responsibility.user.first_names}
+                        </Typography>
+                        <AssignedResponsibilityManagement
+                          handleRemove={() => {
+                            handleRemoveResponsibility(responsibility)
+                          }}
+                          responsibility={responsibility}
+                        />
                       </Box>
                     ))}
                   </Stack>
@@ -224,20 +252,30 @@ const Course = () => {
         </Paper>
       </Box>
 
-      <Modal sx={{
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center'
-      }} open={addTeacherViewOpen} onClose={() => setAddTeacherViewOpen(false)}>
-        <Box sx={{
-          width: '80vw',
-          height: '80vh',
-          background: 'white',
-          padding: '2rem'
-        }}>
-
-          <ActionUserSearch onSelect = {(user: User) => {handleAddResponsible(user)}} actionText={t('course:add')} actionButtonText={t('course:add')}/>
-
+      <Modal
+        sx={{
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+        }}
+        open={addTeacherViewOpen}
+        onClose={() => setAddTeacherViewOpen(false)}
+      >
+        <Box
+          sx={{
+            width: '80vw',
+            height: '80vh',
+            background: 'white',
+            padding: '2rem',
+          }}
+        >
+          <ActionUserSearch
+            onSelect={(user: User) => {
+              handleAddResponsible(user)
+            }}
+            actionText={t('course:add')}
+            actionButtonText={t('course:add')}
+          />
         </Box>
       </Modal>
 
@@ -264,15 +302,13 @@ const Course = () => {
   )
 }
 
-const AssignedResponsibilityManagement = ({responsibility, handleRemove}) => {
+const AssignedResponsibilityManagement = ({ responsibility, handleRemove }) => {
   const { t, i18n } = useTranslation()
-  if(!responsibility.createdByUserId){
-   return (
-    <Stack direction={'row'} sx={{marginLeft: 'auto', alignItems: 'center', height: '1rem'}} >
-    </Stack>
-  )}
+  if (!responsibility.createdByUserId) {
+    return <Stack direction={'row'} sx={{ marginLeft: 'auto', alignItems: 'center', height: '1rem' }}></Stack>
+  }
   return (
-    <Stack direction={'row'} sx={{marginLeft: 'auto', alignItems: 'center', height: '1rem'}} >
+    <Stack direction={'row'} sx={{ marginLeft: 'auto', alignItems: 'center', height: '1rem' }}>
       <Typography>{t('course:customResponsibility')}</Typography>
       <Button onClick={handleRemove}>{t('course:remove')}</Button>
     </Stack>
diff --git a/src/server/routes/course.ts b/src/server/routes/course.ts
@@ -299,7 +299,7 @@ const userAssignedAsResponsible = (userId, chatInstance) => {
   return isResponsible
 }
 
-const getUser = async (id: string):Promise<User | null> => {
+const getUser = async (id: string): Promise<User | null> => {
   const user = await User.findByPk(id)
   if (!user) {
     throw ApplicationError.NotFound('User not found')
@@ -308,7 +308,7 @@ const getUser = async (id: string):Promise<User | null> => {
   return user
 }
 
-const getUserByUsername = async (username: string):Promise<User | null> => {
+const getUserByUsername = async (username: string): Promise<User | null> => {
   const user = await User.findOne({
     where: {
       username: username,
@@ -340,7 +340,7 @@ courseRouter.post('/:id/responsibilities/assign', async (req, res) => {
   const { user } = request
   const chatInstance = await getChatInstance(chatInstanceId)
   const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
-  if(!hasPermission){
+  if (!hasPermission) {
     res.status(401).send('Unauthorized')
     return
   }
@@ -371,10 +371,9 @@ courseRouter.post('/:id/responsibilities/assign', async (req, res) => {
       id: userToAssign.id,
       first_names: userToAssign.firstNames,
       last_name: userToAssign.lastName,
-      username: userToAssign.username
-    }
+      username: userToAssign.username,
+    },
   }
-  
 
   res.json(responsibilityToReturn)
 })
@@ -403,7 +402,7 @@ courseRouter.post('/:id/responsibilities/remove', async (req, res) => {
   const { user } = request
   const chatInstance = await getChatInstance(chatInstanceId)
   const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
-  if(!hasPermission){
+  if (!hasPermission) {
     res.status(401).send('Unauthorized')
     return
   }
@@ -414,29 +413,28 @@ courseRouter.post('/:id/responsibilities/remove', async (req, res) => {
     return
   }
 
-  const assignedUserId:string = userToRemove.id
-  const userAssignedAlready:boolean = await userAssignedAsResponsible(assignedUserId, chatInstance)
+  const assignedUserId: string = userToRemove.id
+  const userAssignedAlready: boolean = await userAssignedAsResponsible(assignedUserId, chatInstance)
   if (!userAssignedAlready) {
     res.status(400).send('User to remove not found')
     return
   }
 
   const responsibilityToRemove = await Responsibility.findOne({
-     where: {
-       userId: assignedUserId,
-       chatInstanceId: chatInstanceId
-     },
+    where: {
+      userId: assignedUserId,
+      chatInstanceId: chatInstanceId,
+    },
   })
-  if(!responsibilityToRemove?.createdByUserId){
+  if (!responsibilityToRemove?.createdByUserId) {
     res.status(400).send('Can only remove user that has been manually added')
     return
   }
 
-  try{
+  try {
     await responsibilityToRemove?.destroy()
-    res.json({result: "success"})
-  }
-  catch{
+    res.json({ result: 'success' })
+  } catch {
     res.status(500).send('Unknown error occurred')
   }
 })
