#1183 finishing touches

Author: walker-sean

src/backend/src/services/teams.services.ts

@@ -164,7 +164,6 @@ export default class TeamsService {
       },
       ...teamQueryArgs
     });
-
     return teamTransformer(updateTeam);
   }
 
@@ -179,6 +178,6 @@ export default class TeamsService {
     if (!team) throw new NotFoundException('Team', teamId);
     if (!isAdmin(deleter.role)) throw new AccessDeniedAdminOnlyException('delete teams');
 
-    await prisma.team.delete({ where: { teamId } });
+    await prisma.team.delete({ where: { teamId }, ...teamQueryArgs });
   }
 }

src/frontend/src/apis/teams.api.ts

@@ -38,5 +38,5 @@ export const setTeamHead = (id: string, userId: number) => {
 };
 
 export const deleteTeam = (id: string) => {
-  return axios.post<{ message: string }>(apiUrls.teamsDelete(id));
+  return axios.post(apiUrls.teamsDelete(id));
 };

src/frontend/src/pages/TeamDetailPage/DeleteTeamModalContainer/DeleteTeam.tsx

@@ -1,6 +1,6 @@
 import { useHistory } from 'react-router-dom';
 import { useToast } from '../../../hooks/toasts.hooks';
-import { useDeleteTeam } from '../../../hooks/teams.hooks';
+import { useDeleteTeam, useSingleTeam } from '../../../hooks/teams.hooks';
 import LoadingIndicator from '../../../components/LoadingIndicator';
 import ErrorPage from '../../ErrorPage';
 import DeleteTeamView from './DeleteTeamView';
@@ -12,23 +12,26 @@ interface DeleteTeamProps {
 }
 
 export interface DeleteTeamInputs {
-  teamId: string;
+  teamName: string;
 }
 
 const DeleteTeam: React.FC<DeleteTeamProps> = ({ teamId, showModal, handleClose }: DeleteTeamProps) => {
   const history = useHistory();
   const toast = useToast();
   const { isLoading, isError, error, mutateAsync } = useDeleteTeam();
+  const { data: team } = useSingleTeam(teamId);
 
-  const handleConfirm = async ({ teamId }: DeleteTeamInputs) => {
-    try {
-      await mutateAsync(teamId);
-      handleClose();
-      history.goBack();
-      toast.success('Team deleted successfully!');
-    } catch (e) {
-      if (e instanceof Error) {
-        toast.error(e.message);
+  const handleConfirm = async ({ teamName }: DeleteTeamInputs) => {
+    if (team?.teamName.toLowerCase() === teamName.toLowerCase()) {
+      try {
+        await mutateAsync(teamId);
+        handleClose();
+        history.goBack();
+        toast.success('Team deleted successfully!');
+      } catch (e) {
+        if (e instanceof Error) {
+          toast.error(e.message);
+        }
       }
     }
   };

src/frontend/src/pages/TeamDetailPage/DeleteTeamModalContainer/DeleteTeamView.tsx

@@ -16,7 +16,6 @@ import {
   Typography
 } from '@mui/material';
 import CloseIcon from '@mui/icons-material/Close';
-import { wbsPipe } from 'shared';
 import NERFailButton from '../../../components/NERFailButton';
 import NERSuccessButton from '../../../components/NERSuccessButton';
 import ReactHookTextField from '../../../components/ReactHookTextField';
@@ -32,7 +31,7 @@ const DeleteTeamView: React.FC<DeleteTeamViewProps> = ({ teamId, showModal, onHi
   const { isLoading, isError, data: team, error } = useSingleTeam(teamId);
 
   const teamNameTester = (teamName: string | undefined) =>
-    team !== undefined && teamName !== undefined && teamName.toLowerCase === team.teamName.toLowerCase;
+    team !== undefined && teamName !== undefined && teamName.toLowerCase() === team.teamName.toLowerCase();
 
   const schema = yup.object().shape({
     teamName: yup.string().required().test('team-name-test', 'Team name does not match', teamNameTester)
@@ -53,10 +52,8 @@ const DeleteTeamView: React.FC<DeleteTeamViewProps> = ({ teamId, showModal, onHi
   if (isLoading || !team) return <LoadingIndicator />;
   if (isError) return <ErrorPage message={error.message} />;
 
-  const onSubmitWrapper = async (data: { teamName: string }) => {
-    const submitVal = { teamId };
-
-    await onSubmit(submitVal);
+  const onSubmitWrapper = async (data: DeleteTeamInputs) => {
+    await onSubmit(data);
   };
 
   return (
@@ -117,7 +114,7 @@ const DeleteTeamView: React.FC<DeleteTeamViewProps> = ({ teamId, showModal, onHi
         <NERSuccessButton variant="contained" sx={{ mx: 1 }} onClick={onHide}>
           Cancel
         </NERSuccessButton>
-        <NERFailButton variant="contained" type="submit" form="delete-wp-form" sx={{ mx: 1 }} disabled={!isValid}>
+        <NERFailButton variant="contained" type="submit" form="delete-team-form" sx={{ mx: 1 }} disabled={!isValid}>
           Delete
         </NERFailButton>
       </DialogActions>

src/frontend/src/pages/TeamDetailPage/TeamDetailPage.tsx

@@ -1,4 +1,4 @@
-import { Button, Grid, ListItemIcon, MenuItem } from '@mui/material';
+import { Grid } from '@mui/material';
 import { useSingleTeam } from '../../hooks/teams.hooks';
 import { useParams } from 'react-router-dom';
 import TeamMembersPageBlock from './TeamMembersPageBlock';

src/frontend/src/utils/urls.ts

@@ -68,7 +68,7 @@ const changeRequestCreateProposeSolution = () => `${changeRequestsCreate()}/prop
 /**************** Teams Endpoints ****************/
 const teams = () => `${API_URL}/teams`;
 const teamsById = (id: string) => `${teams()}/${id}`;
-const teamsDelete = (id: string) => `${teams()}/${id}`;
+const teamsDelete = (id: string) => `${teamsById(id)}/delete`;
 const teamsSetMembers = (id: string) => `${teamsById(id)}/set-members`;
 const teamsSetHead = (id: string) => `${teamsById(id)}/set-head`;
 const teamsSetDescription = (id: string) => `${teamsById(id)}/edit-description`;