Make keyboard shortcuts work with external IDs

Part of #3024

Author: nickygerritsen

webapp/public/js/domjudge.js

@@ -998,14 +998,16 @@ function initializeKeyboardShortcuts() {
             var parts = window.location.href.split('/');
             var lastPart = parts[parts.length - 1];
             var params = lastPart.split('?');
-            var currentNumber = parseInt(params[0]);
-            if (isNaN(currentNumber)) {
-                return;
-            }
             if (key === 'j') {
-                parts[parts.length - 1] = currentNumber + 1;
+                if (!window.nextEntity) {
+                    return;
+                }
+                parts[parts.length - 1] = window.nextEntity;
             } else if (key === 'k') {
-                parts[parts.length - 1] = currentNumber - 1;
+                if (!window.previousEntity) {
+                    return;
+                }
+                parts[parts.length - 1] = window.previousEntity;
             }
             if (params.length > 1) {
                 parts[parts.length - 1] += '?' + params[1];
@@ -1039,9 +1041,13 @@ function initializeKeyboardShortcuts() {
                     sequence = '';
                     return;
                 }
-                if (e.key >= '0' && e.key <= '9') {
+                if (/^[a-zA-Z0-9_.-]$/.test(e.key)) {
                     sequence += e.key;
                     box.text(type + sequence);
+                } else if (e.key === 'Backspace') {
+                    e.preventDefault();
+                    sequence = sequence.slice(0, -1);
+                    box.text(type + sequence);
                 } else {
                     ignore = false;
                     if (box) {

webapp/src/Controller/BaseController.php

@@ -563,7 +563,7 @@ protected function addEntityCheckbox(array &$data, object $entity, mixed $identi
                     '<input type="checkbox" name="ids[]" value="%s" class="%s">',
                     $identifierValue,
                     $checkboxClass
-                )
+                ),
             ];
         }
     }
@@ -665,4 +665,120 @@ protected function processAddFormForExternalIdEntity(
 
         return null;
     }
+
+    /**
+     * Get the previous and next object IDs for navigation.
+     *
+     * @param class-string                $entityClass     Entity class to query
+     * @param mixed                       $currentIdValue  Current value of the ID field
+     * @param string                      $idField         Field to return as the ID (e.g., 'externalid', 'submitid')
+     * @param array<string, 'ASC'|'DESC'> $orderBy         Sort criteria as field => direction (e.g., ['e.submittime' => 'ASC', 'e.submitid' => 'ASC'])
+     * @param bool                        $filterOnContest Whether to filter results by current contests
+     *
+     * @return array{previous: string|int|null, next: string|int|null}
+     */
+    protected function getPreviousAndNextObjectIds(
+        string $entityClass,
+        mixed $currentIdValue,
+        string $idField = 'externalid',
+        array $orderBy = ['e.externalid' => 'ASC'],
+        bool $filterOnContest = false,
+    ): array {
+        $result = ['previous' => null, 'next' => null];
+
+        // Fetch the current entity once to get field values
+        $currentEntity = $this->em->getRepository($entityClass)->findOneBy([$idField => $currentIdValue]);
+        if ($currentEntity === null) {
+            return $result;
+        }
+
+        $accessor = PropertyAccess::createPropertyAccessor();
+
+        // Pre-compute field values for comparison
+        $fieldValues = [];
+        foreach (array_keys($orderBy) as $field) {
+            $fieldName = str_replace('e.', '', $field);
+            $fieldValues[$field] = $accessor->getValue($currentEntity, $fieldName);
+        }
+
+        // Build the comparison conditions based on the sort criteria.
+        // For multi-column ordering, we need: (col1 < val1) OR (col1 = val1 AND col2 < val2) etc.
+        $buildComparisonConditions = function (string $operator) use ($orderBy, $fieldValues): array {
+            $conditions = [];
+            $parameters = [];
+            $fields = array_keys($orderBy);
+            $directions = array_values($orderBy);
+
+            for ($i = 0; $i < count($fields); $i++) {
+                $equalityParts = [];
+                // Add equality conditions for all previous columns
+                for ($j = 0; $j < $i; $j++) {
+                    $field = $fields[$j];
+                    $paramName = 'eq_' . $j;
+                    $equalityParts[] = "$field = :$paramName";
+                    $parameters[$paramName] = $fieldValues[$field];
+                }
+
+                // Add the comparison for this column
+                $field = $fields[$i];
+                $direction = $directions[$i];
+                // For "previous": if ASC, we want < ; if DESC, we want >
+                // For "next": if ASC, we want > ; if DESC, we want <
+                $compOp = ($operator === 'previous')
+                    ? ($direction === 'ASC' ? '<' : '>')
+                    : ($direction === 'ASC' ? '>' : '<');
+                $paramName = 'cmp_' . $i;
+                $comparisonPart = "$field $compOp :$paramName";
+                $parameters[$paramName] = $fieldValues[$field];
+
+                if (!empty($equalityParts)) {
+                    $conditions[] = '(' . implode(' AND ', $equalityParts) . ' AND ' . $comparisonPart . ')';
+                } else {
+                    $conditions[] = '(' . $comparisonPart . ')';
+                }
+            }
+
+            return ['condition' => implode(' OR ', $conditions), 'parameters' => $parameters];
+        };
+
+        foreach (['previous', 'next'] as $direction) {
+            $qb = $this->em->createQueryBuilder()
+                ->select("e.$idField")
+                ->from($entityClass, 'e');
+
+            // Build and apply the comparison conditions
+            $comp = $buildComparisonConditions($direction);
+            if (!empty($comp['condition'])) {
+                $qb->andWhere($comp['condition']);
+                foreach ($comp['parameters'] as $param => $value) {
+                    $qb->setParameter($param, $value);
+                }
+            }
+
+            // Apply contest filter
+            if ($filterOnContest && $contest = $this->dj->getCurrentContest()) {
+                $qb->andWhere('e.contest = :contest')
+                    ->setParameter('contest', $contest);
+            }
+
+            // Apply ordering (reversed for previous)
+            foreach ($orderBy as $field => $dir) {
+                $actualDir = $direction === 'previous'
+                    ? ($dir === 'ASC' ? 'DESC' : 'ASC')
+                    : $dir;
+                $qb->addOrderBy($field, $actualDir);
+            }
+
+            $qb->setMaxResults(1);
+
+            try {
+                $value = $qb->getQuery()->getSingleScalarResult();
+                $result[$direction] = $value;
+            } catch (NoResultException) {
+                // No previous/next found, leave as null
+            }
+        }
+
+        return $result;
+    }
 }

webapp/src/Controller/Jury/AnalysisController.php

@@ -86,8 +86,7 @@ public function indexAction(
     public function teamAction(
         #[MapEntity(mapping: ['team' => 'externalid'])]
         Team $team,
-    ): Response
-    {
+    ): Response {
         $contest = $this->dj->getCurrentContest();
 
         if ($contest === null) {

webapp/src/Controller/Jury/ClarificationController.php

@@ -2,6 +2,7 @@
 
 namespace App\Controller\Jury;
 
+use App\Controller\BaseController;
 use App\Entity\Clarification;
 use App\Entity\Contest;
 use App\Entity\Problem;
@@ -20,19 +21,23 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted('ROLE_CLARIFICATION_RW')]
 #[Route(path: '/jury/clarifications')]
-class ClarificationController extends AbstractController
+class ClarificationController extends BaseController
 {
     public function __construct(
-        protected readonly EntityManagerInterface $em,
-        protected readonly DOMJudgeService $dj,
+        EntityManagerInterface $em,
+        DOMJudgeService $dj,
         protected readonly ConfigurationService $config,
-        protected readonly EventLogService $eventLogService
-    ) {}
+        EventLogService $eventLogService,
+        KernelInterface $kernel,
+    ) {
+        parent::__construct($em, $eventLogService, $dj, $kernel);
+    }
 
     #[Route(path: '', name: 'jury_clarifications')]
     public function indexAction(
@@ -236,6 +241,11 @@ public function viewAction(Request $request, string $id): Response
             ->getQuery()
             ->getSingleResult()['jury_member'];
 
+        $parameters['previousNext'] = $this->getPreviousAndNextObjectIds(
+            Clarification::class,
+            $clarification->getExternalid(),
+        );
+
         return $this->render('jury/clarification.html.twig', $parameters);
     }
 
@@ -429,7 +439,7 @@ protected function processSubmittedClarification(
 
         $clarId = $clarification->getClarId();
         $this->dj->auditlog('clarification', $clarification->getExternalid(), 'added', null, null, $contest->getExternalid());
-        $this->eventLogService->log('clarification', $clarId, 'create', $contest->getCid());
+        $this->eventLog->log('clarification', $clarId, 'create', $contest->getCid());
         // Reload clarification to make sure we have a fresh one after calling the event log service.
         $clarification = $this->em->getRepository(Clarification::class)->find($clarId);
 

webapp/src/Controller/Jury/ContestController.php

@@ -352,6 +352,10 @@ public function viewAction(Request $request, string $contestId): Response
 
         return $this->render('jury/contest.html.twig', [
             'contest' => $contest,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Contest::class,
+                $contest->getExternalid(),
+            ),
             'allowRemovedIntervals' => $this->getParameter('removed_intervals'),
             'removedIntervalForm' => $form,
             'removedIntervals' => $removedIntervals,

webapp/src/Controller/Jury/ExecutableController.php

@@ -368,6 +368,12 @@ public function viewAction(
             'uploadForm' => $uploadForm->createView(),
             'selected' => $index,
             'executable' => $executable,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Executable::class,
+                $executable->getExecid(),
+                'execid',
+                ['e.execid' => 'ASC'],
+            ),
             'default_compare' => (string)$this->config->get('default_compare'),
             'default_run' => (string)$this->config->get('default_run'),
             'default_full_debug' => (string)$this->config->get('default_full_debug'),

webapp/src/Controller/Jury/JudgehostController.php

@@ -280,6 +280,12 @@ public function viewAction(Request $request, int $judgehostid): Response
 
         $data = [
             'judgehost' => $judgehost,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Judgehost::class,
+                $judgehost->getJudgehostid(),
+                'judgehostid',
+                ['e.judgehostid' => 'ASC'],
+            ),
             'status' => $status,
             'statusIcon' => $statusIcon,
             'judgings' => $judgings,

webapp/src/Controller/Jury/LanguageController.php

@@ -198,6 +198,10 @@ public function viewAction(Request $request, SubmissionService $submissionServic
 
         $data = [
             'language' => $language,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Language::class,
+                $language->getExternalid(),
+            ),
             'submissions' => $submissions,
             'submissionCounts' => $submissionCounts,
             'showContest' => count($this->dj->getCurrentContests(honorCookie: true)) > 1,

webapp/src/Controller/Jury/ProblemController.php

@@ -503,6 +503,10 @@ public function viewAction(Request $request, SubmissionService $submissionServic
 
         $data = [
             'problem' => $problem,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Problem::class,
+                $problem->getExternalid(),
+            ),
             'problemAttachmentForm' => $problemAttachmentForm->createView(),
             'submissions' => $submissions,
             'submissionCounts' => $submissionCounts,

webapp/src/Controller/Jury/RejudgingController.php

@@ -392,6 +392,12 @@ public function viewAction(
 
         $data = [
             'rejudging' => $rejudging,
+            'previousNext' => $this->getPreviousAndNextObjectIds(
+                Rejudging::class,
+                $rejudging->getRejudgingid(),
+                'rejudgingid',
+                ['e.rejudgingid' => 'ASC'],
+            ),
             'todo' => $todo,
             'done' => $done,
             'verdicts' => $verdicts,