Semester administration enhancements (#499)

* SemesterAdministration layout changes * SemesterAdministration only display Freeze buttons if the series/semester is not yet complete * Refetching semester on successful freeze of semester or series * SemesterAdministration separate errors for each series * SemesterAdmin removed semester freezing. Semester freezes automatically when all series are frozen. * Unset error message on success --------- Co-authored-by: matushl <[email protected]>
ZdruzenieSTROM · Nov 24, 2024 · d08e2cb · d08e2cb
1 parent 2b90a89
commit d08e2cb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 39 deletions.
diff --git a/src/components/SemesterAdministration/SemesterAdministration.tsx b/src/components/SemesterAdministration/SemesterAdministration.tsx
@@ -1,5 +1,5 @@
 import {Stack, Typography} from '@mui/material'
-import {useQuery} from '@tanstack/react-query'
+import {useMutation, useQuery} from '@tanstack/react-query'
 import axios, {AxiosError} from 'axios'
 import {FC, useState} from 'react'
 
@@ -33,7 +33,11 @@ export const SemesterAdministration: FC = () => {
 
   const {hasPermissions, permissionsIsLoading} = useHasPermissions()
 
-  const {data: semesterData, isLoading: semesterIsLoading} = useQuery({
+  const {
+    data: semesterData,
+    isLoading: semesterIsLoading,
+    refetch,
+  } = useQuery({
     queryKey: ['competition', 'semester', semesterId],
     queryFn: () => axios.get<SemesterWithProblems>(`/api/competition/semester/${semesterId}`),
     // router.query.params su v prvom renderi undefined, tak pustime query az so spravnym semesterId
@@ -84,34 +88,22 @@ export const SemesterAdministration: FC = () => {
     )
   }
 
-  const [semesterFreezeError, setSemesterFreezeError] = useState<string>()
-  const [seriesFreezeError, setSeriesFreezeError] = useState<string>()
-
-  const freezeSemester = async (semester: SemesterWithProblems) => {
-    setSemesterFreezeError('')
-    try {
-      await axios.post(`/api/competition/semester/${semester.id}/results/freeze`)
-    } catch (error: unknown) {
-      if (error instanceof AxiosError) {
-        setSemesterFreezeError(error.response?.data.detail)
-      } else {
-        setSemesterFreezeError('Nastala neznáma chyba.')
-      }
-    }
-  }
+  const [seriesFreezeErrors, setSeriesFreezeErrors] = useState<Map<number, string>>()
 
-  const freezeSeries = async (series: SeriesWithProblems) => {
-    setSeriesFreezeError('')
-    try {
-      await axios.post(`/api/competition/series/${series.id}/results/freeze`)
-    } catch (error: unknown) {
+  const {mutate: freezeSeries} = useMutation({
+    mutationFn: (series: SeriesWithProblems) => axios.post(`/api/competition/series/${series.id}/results/freeze`),
+    onSuccess: (_, variables: SeriesWithProblems) => {
+      setSeriesFreezeErrors((prev) => new Map(prev).set(variables.id, ''))
+      refetch()
+    },
+    onError: (error: unknown, variables: SeriesWithProblems) => {
       if (error instanceof AxiosError) {
-        setSeriesFreezeError(error.response?.data.detail)
+        setSeriesFreezeErrors((prev) => new Map(prev).set(variables.id, error.response?.data.detail))
       } else {
-        setSeriesFreezeError('Nastala neznáma chyba.')
+        setSeriesFreezeErrors((prev) => new Map(prev).set(variables.id, 'Nastala neznáma chyba.'))
       }
-    }
-  }
+    },
+  })
 
   if (
     urlDataLoading.currentSeriesIsLoading ||
@@ -130,24 +122,29 @@ export const SemesterAdministration: FC = () => {
 
   return (
     <>
-      <Typography variant="h3">Administrácia semestra pre opravovateľov.</Typography>
-      <Stack mt={3} pl={2} alignItems="start">
-        <Button variant="button2" onClick={() => freezeSemester(semester)}>
-          Uzavrieť semester
-        </Button>
-        {semesterFreezeError && <Typography variant="body1">{semesterFreezeError}</Typography>}
+      <Stack alignItems="start" direction="row" spacing={2}>
+        <Typography variant="h2">Semester</Typography>
+        {semester.complete && <Typography variant="body1">Semester je uzavretý</Typography>}
       </Stack>
       {semester.series_set.map((series) => (
         <Stack key={series.id} gap={1} mt={5}>
-          <Typography variant="h2">{series.order}. séria</Typography>
-          <Stack pl={2} alignItems="start">
-            <Button variant="button2" onClick={() => freezeSeries(series)}>
-              Uzavrieť sériu
-            </Button>
-            {seriesFreezeError && <Typography variant="body1">{seriesFreezeError}</Typography>}
+          <Stack alignItems="start" direction="row" spacing={2}>
+            <Typography variant="h3">{series.order}. séria</Typography>
+            {series.complete ? (
+              <Typography variant="body1">Séria je uzavretá</Typography>
+            ) : (
+              <Button variant="button2" onClick={() => freezeSeries(series)}>
+                Uzavrieť sériu
+              </Button>
+            )}
+            {seriesFreezeErrors?.get(series.id) && (
+              <Typography variant="body1">{seriesFreezeErrors?.get(series.id)}</Typography>
+            )}
           </Stack>
           <Stack direction="row" justifyContent="space-between" alignItems="center">
-            <Typography variant="h3">Opravovanie úloh:</Typography>
+            <Typography variant="body1" component="div">
+              <b>Opravovanie úloh:</b>
+            </Typography>
             <Typography variant="body1" component="div">
               <b>Termín série:</b> {formatDateTime(series.deadline)}
             </Typography>

diff --git a/src/types/api/generated/competition.ts b/src/types/api/generated/competition.ts
@@ -142,6 +142,7 @@ export interface Semester {
   start: string
   end: string
   additional_name?: string | null
+  complete: boolean
   frozen_results?: string | null
   competition?: any | null
   late_tags?: any[]
@@ -159,6 +160,7 @@ export interface SemesterWithProblems {
   start: string
   end: string
   additional_name?: string | null
+  complete: boolean
   frozen_results?: string | null
   competition?: any | null
   late_tags?: any[]