Merge pull request #276 from SELab-2/no_project_file

project pagina werkt terug als er geen opdrachtsbestand is
SELab-2 · May 19, 2024 · 7fd0dc0 · 7fd0dc0
2 parents 2fc687a + 5d0c222
commit 7fd0dc0
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
@@ -100,28 +100,30 @@ export function AssignmentPage() {
                     `/projecten/${assignmentId}/`
                 )
                 const newAssignment: Project = assignmentResponse.data
-                newAssignment.filename =
-                    assignmentResponse.data.opgave_bestand.replace(
-                        /^.*[\\/]/,
-                        ''
-                    )
-                newAssignment.opgave_bestand = await instance
-                    .get(`/projecten/${assignmentId}/opgave_bestand/`, {
-                        responseType: 'blob',
-                    })
-                    .then((res) => {
-                        let filename = 'indiening.zip'
-                        if (newAssignment.filename) {
-                            filename = newAssignment.filename
-                        }
-                        const blob = new Blob([res.data], {
-                            type: res.headers['content-type'],
+                if (assignmentResponse.data.opgave_bestand) {
+                    newAssignment.filename =
+                        assignmentResponse.data.opgave_bestand.replace(
+                            /^.*[\\/]/,
+                            ''
+                        )
+                    newAssignment.opgave_bestand = await instance
+                        .get(`/projecten/${assignmentId}/opgave_bestand/`, {
+                            responseType: 'blob',
                         })
-                        const file: File = new File([blob], filename, {
-                            type: res.headers['content-type'],
+                        .then((res) => {
+                            let filename = 'indiening.zip'
+                            if (newAssignment.filename) {
+                                filename = newAssignment.filename
+                            }
+                            const blob = new Blob([res.data], {
+                                type: res.headers['content-type'],
+                            })
+                            const file: File = new File([blob], filename, {
+                                type: res.headers['content-type'],
+                            })
+                            return file
                         })
-                        return file
-                    })
+                }
                 setAssignment(newAssignment)
                 if (user) {
                     if (user.is_lesgever) {
@@ -854,7 +856,7 @@ export function AssignmentPage() {
                                     <Button
                                         startIcon={<DownloadIcon />}
                                         onClick={downloadAssignment}
-                                        disabled={assignment === undefined}
+                                        disabled={assignment === undefined || assignment.filename === undefined}
                                     >
                                         {loading ? (
                                             <Skeleton
@@ -869,6 +871,8 @@ export function AssignmentPage() {
                                             <>
                                                 {assignment
                                                     ? assignment.filename
+                                                        ? assignment.filename
+                                                        : t('no_assignmentfile')
                                                     : t('no_assignmentfile')}
                                             </>
                                         )}