Add pagination to submission lists

Fixes #2511
DOMjudge · Dec 15, 2024 · a103327 · a103327
1 parent 0cfe72c
commit a103327
Show file tree

Hide file tree

Showing 29 changed files with 533 additions and 137 deletions.
diff --git a/webapp/composer.json b/webapp/composer.json
@@ -67,6 +67,7 @@
 		"friendsofsymfony/rest-bundle": "^3.5",
 		"ircmaxell/password-compat": "*",
 		"jms/serializer-bundle": "^5.2",
+		"knplabs/knp-paginator-bundle": "^6.6",
 		"league/commonmark": "^2.3",
 		"mbostock/d3": "^3.5",
 		"nelmio/api-doc-bundle": "^4.11",

diff --git a/webapp/composer.lock b/webapp/composer.lock
diff --git a/webapp/config/bundles.php b/webapp/config/bundles.php
@@ -18,4 +18,5 @@
     Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
     Sentry\SentryBundle\SentryBundle::class => ['prod' => true],
     Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    Knp\Bundle\PaginatorBundle\KnpPaginatorBundle::class => ['all' => true],
 ];
diff --git a/webapp/config/packages/knp_paginator.yaml b/webapp/config/packages/knp_paginator.yaml
@@ -0,0 +1,5 @@
+knp_paginator:
+    default_options:
+        default_limit: 50
+    template:
+        pagination: '@KnpPaginator/Pagination/bootstrap_v5_pagination.html.twig'
diff --git a/webapp/src/Controller/API/MetricsController.php b/webapp/src/Controller/API/MetricsController.php
@@ -102,7 +102,8 @@ public function prometheusAction(): Response
             /** @var Submission[] $submissions */
             [$submissions, $submissionCounts] = $this->submissionService->getSubmissionList(
                 [$contest->getCid() => $contest],
-                new SubmissionRestriction(visible: true)
+                new SubmissionRestriction(visible: true),
+                paginated: false
             );
             foreach ($submissionCounts as $kind => $count) {
                 if (!array_key_exists('submissions_' . $kind, $m)) {

diff --git a/webapp/src/Controller/Jury/LanguageController.php b/webapp/src/Controller/Jury/LanguageController.php
@@ -195,7 +195,8 @@ public function viewAction(Request $request, SubmissionService $submissionServic
         /** @var Submission[] $submissions */
         [$submissions, $submissionCounts] = $submissionService->getSubmissionList(
             $this->dj->getCurrentContests(honorCookie: true),
-            new SubmissionRestriction(languageId: $language->getLangid())
+            new SubmissionRestriction(languageId: $language->getLangid()),
+            page: $request->query->getInt('submissions_page', 1),
         );
 
         $data = [

diff --git a/webapp/src/Controller/Jury/ProblemController.php b/webapp/src/Controller/Jury/ProblemController.php
@@ -29,6 +29,7 @@
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query\Expr\Join;
 use Exception;
+use Knp\Component\Pager\Pagination\PaginationInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -487,10 +488,11 @@ public function viewAction(Request $request, SubmissionService $submissionServic
             return $this->redirectToRoute('jury_problem', ['probId' => $probId]);
         }
 
-        /** @var Submission[] $submissions */
+        /** @var PaginationInterface<int, Submission> $submissions */
         [$submissions, $submissionCounts] = $submissionService->getSubmissionList(
             $this->dj->getCurrentContests(honorCookie: true),
             new SubmissionRestriction(problemId: $problem->getProbid()),
+            page: $request->query->getInt('page', 1),
         );
 
         $type = '';

diff --git a/webapp/src/Controller/Jury/RejudgingController.php b/webapp/src/Controller/Jury/RejudgingController.php
@@ -26,6 +26,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query\Expr\Join;
+use Knp\Component\Pager\Pagination\PaginationInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -330,7 +331,7 @@ public function viewAction(
             $verdictTable[$originalVerdict->getResult()][$newVerdict->getResult()][] = $submitid;
         }
 
-        $viewTypes = [0 => 'newest', 1 => 'unverified', 2 => 'unjudged', 3 => 'diff', 4 => 'all'];
+        $viewTypes = [0 => 'unverified', 1 => 'unjudged', 2 => 'diff', 3 => 'all'];
         $defaultView = 'diff';
         $onlyAHandfulOfSubmissions = $rejudging->getSubmissions()->count() <= 5;
         if ($onlyAHandfulOfSubmissions) {
@@ -362,10 +363,11 @@ public function viewAction(
             $restrictions->result = $newverdict;
         }
 
-        /** @var Submission[] $submissions */
+        /** @var PaginationInterface<int, Submission> $submissions */
         [$submissions, $submissionCounts] = $submissionService->getSubmissionList(
             $this->dj->getCurrentContests(honorCookie: true),
-            $restrictions
+            $restrictions,
+            page: $request->query->getInt('page', 1),
         );
 
         $repetitions = $this->em->createQueryBuilder()

diff --git a/webapp/src/Controller/Jury/ShadowDifferencesController.php b/webapp/src/Controller/Jury/ShadowDifferencesController.php
@@ -205,6 +205,7 @@ public function indexAction(
         [$submissions, $submissionCounts] = $this->submissions->getSubmissionList(
             $this->dj->getCurrentContests(honorCookie: true),
             $restrictions,
+            page: $request->query->getInt('page', 1),
             showShadowUnverified: true
         );