Merge pull request #320 from SELab-2/last_last_bugs

regex + filename
SELab-2 · May 23, 2024 · f8f3f17 · f8f3f17
2 parents 0273bad + 1a9e80e
commit f8f3f17
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx b/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx
@@ -139,11 +139,10 @@ export function SubmissionPage() {
                     newSubmission.status !== SubmissionStatus.PENDING &&
                     newSubmission.result !== 'No tests: OK'
                 ) {
-                    const regex = /Testing (.*)$/
-                    const matches = newSubmission.result.match(regex)
-                    if (matches !== null) {
-                        newSubmission.result = matches[0]
-                    }
+                    const match = newSubmission.result.match(/Testing.*/)
+                    newSubmission.result = match
+                        ? match[0]
+                        : newSubmission.result
                 }
                 newSubmission.filename =
                     submissionResponse.data.bestand.replace(/^.*[\\/]/, '')
@@ -423,9 +422,10 @@ export function SubmissionPage() {
                                                                         'bold'
                                                                     }
                                                                 >
-                                                                    {
-                                                                        restriction.script
-                                                                    }
+                                                                    {restriction.script.replace(
+                                                                        /^.*[\\/]/,
+                                                                        ''
+                                                                    )}
                                                                 </Typography>
                                                                 <Typography
                                                                     variant={