Auto calculate num actions for jury tables.

DOMjudge · Sep 27, 2023 · bbe9787 · bbe9787
1 parent 9457175
commit bbe9787
Show file tree

Hide file tree

Showing 20 changed files with 171 additions and 253 deletions.
diff --git a/webapp/src/Controller/Jury/ContestController.php b/webapp/src/Controller/Jury/ContestController.php
@@ -379,7 +379,6 @@ public function indexAction(Request $request): Response
             'upcoming_contest' => $upcomingContest,
             'contests_table' => $contests_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') && !$contest->isLocked() ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/ExecutableController.php b/webapp/src/Controller/Jury/ExecutableController.php
@@ -6,16 +6,13 @@
 use App\Entity\Executable;
 use App\Entity\ExecutableFile;
 use App\Entity\ImmutableExecutable;
-use App\Entity\Role;
-use App\Form\Type\ExecutableType;
 use App\Form\Type\ExecutableUploadType;
 use App\Service\ConfigurationService;
 use App\Service\DOMJudgeService;
 use App\Service\EventLogService;
 use App\Utils\Utils;
 use Doctrine\ORM\EntityManagerInterface;
-use FOS\RestBundle\Controller\Annotations as Rest;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -29,35 +26,19 @@
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * @Route("/jury/executables")
- * @IsGranted("ROLE_JURY")
- */
+#[IsGranted('ROLE_JURY')]
+#[Route(path: '/jury/executables')]
 class ExecutableController extends BaseController
 {
-    protected EntityManagerInterface $em;
-    protected DOMJudgeService $dj;
-    protected ConfigurationService $config;
-    protected KernelInterface $kernel;
-    protected EventLogService $eventLogService;
-
     public function __construct(
-        EntityManagerInterface $em,
-        DOMJudgeService $dj,
-        ConfigurationService $config,
-        KernelInterface $kernel,
-        EventLogService $eventLogService
-    ) {
-        $this->em              = $em;
-        $this->dj              = $dj;
-        $this->config          = $config;
-        $this->kernel          = $kernel;
-        $this->eventLogService = $eventLogService;
-    }
-
-    /**
-     * @Route("", name="jury_executables")
-     */
+        protected readonly EntityManagerInterface $em,
+        protected readonly DOMJudgeService $dj,
+        protected readonly ConfigurationService $config,
+        protected readonly KernelInterface $kernel,
+        protected readonly EventLogService $eventLogService
+    ) {}
+
+    #[Route(path: '', name: 'jury_executables')]
     public function indexAction(Request $request): Response
     {
         $data = [];
@@ -116,15 +97,12 @@ public function indexAction(Request $request): Response
         return $this->render('jury/executables.html.twig', [
             'executables' => $executables_table,
             'table_fields' => $table_fields,
-            'num_actions' => count($execactions),
-            'form' => $form->createView(),
+            'form' => $form,
         ]);
     }
 
-    /**
-     * @Route("/add", name="jury_executable_add")
-     * @IsGranted("ROLE_ADMIN")
-     */
+    #[IsGranted('ROLE_ADMIN')]
+    #[Route(path: '/add', name: 'jury_executable_add')]
     public function addAction(Request $request): Response
     {
         $data = [];
@@ -141,7 +119,7 @@ public function addAction(Request $request): Response
                 $zip         = $this->dj->openZipFile($archive->getRealPath());
                 $filename    = $archive->getClientOriginalName();
                 $id          = substr($filename, 0, strlen($filename) - strlen(".zip"));
-                if (! preg_match ('#^[a-z0-9_-]+$#i', $id)) {
+                if (! preg_match('#^[a-z0-9_-]+$#i', $id)) {
                     throw new InvalidArgumentException(sprintf("File base name '%s' must contain only alphanumerics", $id));
                 }
                 $description = $id;
@@ -183,13 +161,11 @@ public function addAction(Request $request): Response
         }
 
         return $this->render('jury/executable_add.html.twig', [
-            'form' => $form->createView(),
+            'form' => $form,
         ]);
     }
 
-    /**
-     * @Route("/{execId}", name="jury_executable")
-     */
+    #[Route(path: '/{execId}', name: 'jury_executable')]
     public function viewAction(Request $request, string $execId): Response
     {
         /** @var Executable $executable */
@@ -227,7 +203,7 @@ public function viewAction(Request $request, string $execId): Response
             $files = [];
             foreach ($editorData['filenames'] as $idx => $filename) {
                 $newContent = str_replace("\r\n", "\n", $submittedData['source' . $idx]);
-                if (substr($newContent, -1) != "\n") {
+                if (!str_ends_with($newContent, "\n")) {
                     // Ace swallows the newline at the end of file. Let's re-add it like most editors do.
                     $newContent .= "\n";
                 }
@@ -241,18 +217,6 @@ public function viewAction(Request $request, string $execId): Response
                 $this->em->persist($executableFile);
                 $files[] = $executableFile;
             }
-            $offset = count($files);
-            foreach ($editorData['skippedBinary'] as $idx => $skippedBinaryData) {
-                $origExecutableFile = $this->em->getRepository(ExecutableFile::class)->find($skippedBinaryData['execfileid']);
-                $executableFile = new ExecutableFile();
-                $executableFile
-                    ->setRank($idx + $offset)
-                    ->setIsExecutable($origExecutableFile->isExecutable())
-                    ->setFilename($origExecutableFile->getFilename())
-                    ->setFileContent($origExecutableFile->getFileContent());
-                $this->em->persist($executableFile);
-                $files[] = $executableFile;
-            }
 
             $immutableExecutable = new ImmutableExecutable($files);
             $this->em->persist($immutableExecutable);
@@ -301,9 +265,7 @@ public function viewAction(Request $request, string $execId): Response
         ]));
     }
 
-    /**
-     * @Route("/{execId}/download", name="jury_executable_download")
-     */
+    #[Route(path: '/{execId}/download', name: 'jury_executable_download')]
     public function downloadAction(string $execId): Response
     {
         /** @var Executable $executable */
@@ -318,10 +280,8 @@ public function downloadAction(string $execId): Response
         return Utils::streamAsBinaryFile($zipFileContent, $filename, 'zip');
     }
 
-    /**
-     * @Route("/{execId}/delete/{rankToDelete}", name="jury_executable_delete_single")
-     * @IsGranted("ROLE_ADMIN")
-     */
+    #[IsGranted('ROLE_ADMIN')]
+    #[Route(path: '/{execId}/delete/{rankToDelete}', name: 'jury_executable_delete_single')]
     public function deleteSingleAction(Request $request, string $execId, int $rankToDelete): Response
     {
         /** @var Executable $executable */
@@ -388,9 +348,7 @@ public function deleteSingleAction(Request $request, string $execId, int $rankTo
         }
     }
 
-    /**
-     * @Route("/{execId}/download/{rank}", name="jury_executable_download_single")
-     */
+    #[Route(path: '/{execId}/download/{rank}', name: 'jury_executable_download_single')]
     public function downloadSingleAction(string $execId, int $rank): Response
     {
         /** @var Executable $executable */
@@ -410,10 +368,8 @@ public function downloadSingleAction(string $execId, int $rank): Response
         throw new NotFoundHttpException(sprintf('No file with rank %d found.', $rank));
     }
 
-    /**
-     * @Route("/{execId}/delete", name="jury_executable_delete")
-     * @IsGranted("ROLE_ADMIN")
-     */
+    #[IsGranted('ROLE_ADMIN')]
+    #[Route(path: '/{execId}/delete', name: 'jury_executable_delete')]
     public function deleteAction(Request $request, string $execId): Response
     {
         /** @var Executable $executable */
@@ -448,10 +404,7 @@ protected function dataForEditor(Executable $executable): array
             $content = $file->getFileContent();
             $rank = $file->getRank();
             if (!mb_detect_encoding($content, null, true)) {
-                $skippedBinary[] = [
-                    'filename' => $filename,
-                    'execfileid' => $file->getExecFileId(),
-                ];
+                $skippedBinary[] = $filename;
                 continue; // Skip binary files.
             }
             $filenames[] = $filename;
@@ -474,7 +427,7 @@ protected function dataForEditor(Executable $executable): array
 
     private function getAceFilename(string $filename, string $content): string
     {
-        if (strpos($filename, '.') === false) {
+        if (!str_contains($filename, '.')) {
             // If the file does not contain a dot, see if we have a shebang which we can use as filename.
             // We do this to hint the ACE editor to use a specific language.
             [$firstLine] = explode("\n", $content, 2);

diff --git a/webapp/src/Controller/Jury/JudgehostController.php b/webapp/src/Controller/Jury/JudgehostController.php
@@ -184,7 +184,6 @@ public function indexAction(Request $request): Response
         $data = [
             'judgehosts' => $judgehosts_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
             'all_checked_in_recently' => $all_checked_in_recently,
             'refresh' => [
                 'after' => 5,

diff --git a/webapp/src/Controller/Jury/LanguageController.php b/webapp/src/Controller/Jury/LanguageController.php
@@ -146,7 +146,6 @@ public function indexAction(): Response
             'enabled_languages' => $enabled_languages,
             'disabled_languages' => $disabled_languages,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/ProblemController.php b/webapp/src/Controller/Jury/ProblemController.php
@@ -214,7 +214,6 @@ public function indexAction(): Response
         $data = [
             'problems' => $problems_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 4 : 2,
         ];
 
         return $this->render('jury/problems.html.twig', $data);

diff --git a/webapp/src/Controller/Jury/TeamAffiliationController.php b/webapp/src/Controller/Jury/TeamAffiliationController.php
@@ -143,7 +143,6 @@ public function indexAction(string $projectDir): Response
         return $this->render('jury/team_affiliations.html.twig', [
             'team_affiliations' => $team_affiliations_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/TeamCategoryController.php b/webapp/src/Controller/Jury/TeamCategoryController.php
@@ -127,7 +127,6 @@ public function indexAction(): Response
         return $this->render('jury/team_categories.html.twig', [
             'team_categories' => $team_categories_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/TeamController.php b/webapp/src/Controller/Jury/TeamController.php
@@ -239,7 +239,6 @@ public function indexAction(): Response
         return $this->render('jury/teams.html.twig', [
             'teams' => $teams_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 3 : 1,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/UserController.php b/webapp/src/Controller/Jury/UserController.php
@@ -184,7 +184,6 @@ public function indexAction(): Response
         return $this->render('jury/users.html.twig', [
             'users' => $users_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }