Merge branch 'main' into liberror_cppify

Author: meisterT

.github/jobs/configure-checks/setup_configure_image.sh

@@ -10,6 +10,8 @@ case $distro_id in
         dnf install pkg-config make bats autoconf automake util-linux -y ;;
     *)
         apt-get update; apt-get full-upgrade -y
+        # Install g++-12 to make sure we can use -std=c++20
+        version=$(g++ -dumpversion 2>/dev/null | awk -F'.' '{print $1}' 2>/dev/null || echo 0); [ "${version}" -lt 12 ] && apt install -y g++-12
         apt-get install pkg-config make bats autoconf -y ;;
 esac
 

.github/workflows/autoconf-check.yml

@@ -10,7 +10,7 @@ jobs:
   debian-family:
     strategy:
       matrix:
-        version: [jammy, focal, rolling]
+        version: [jammy, rolling]
         os: [ubuntu]
         releaseBranch:
           - ${{ contains(github.ref, 'gh-readonly-queue') }}

submit/submit

@@ -60,7 +60,7 @@ def warn_user(msg: str) -> None:
 
 
 def usage(msg: str) -> NoReturn:
-    logging.error(f'error: {msg}')
+    logging.error(f'\n\033[1;31mERROR: {msg}\033[0m\n')
     print(f"Type '{sys.argv[0]} --help' to get help.")
     exit(1)
 

submit/submit_online.bats

@@ -13,11 +13,11 @@ setup() {
 @test "contest via parameter overrides environment" {
     run ./submit -c bestaatniet
     assert_failure 1
-    assert_partial "error: No (valid) contest specified"
+    assert_partial "ERROR: No (valid) contest specified"
 
     run ./submit --contest=bestaatookniet
     assert_failure 1
-    assert_partial "error: No (valid) contest specified"
+    assert_partial "ERROR: No (valid) contest specified"
 }
 
 @test "hello problem id and name are in help output" {
@@ -78,14 +78,14 @@ setup() {
     cp ../example_problems/hello/submissions/accepted/test-hello.java $BATS_TMPDIR/A.java
     run ./submit -p nonexistent -l cpp $BATS_TMPDIR/A.java <<< "n"
     assert_failure 1
-    assert_partial "error: No known problem specified or detected"
+    assert_partial "ERROR: No known problem specified or detected"
 }
 
 @test "non existing language name emits error" {
     cp ../example_problems/hello/submissions/accepted/test-hello.java $BATS_TMPDIR/hello.java
     run ./submit -p C -l nonexistent $BATS_TMPDIR/hello.java <<< "n"
     assert_failure 1
-    assert_partial "error: No known language specified or detected"
+    assert_partial "ERROR: No known language specified or detected"
 }
 
 @test "detect entry point Java" {

webapp/public/js/domjudge.js

@@ -965,6 +965,7 @@ $(function () {
 function initializeKeyboardShortcuts() {
     var $body = $('body');
     var ignore = false;
+    const validKeys = new Set(['c', 'd', 'j', 'p', 's', 't']);
     $body.on('keydown', function(e) {
         var keysCookie = getCookie('domjudge_keys');
         if (keysCookie != 1 && keysCookie != "") {
@@ -1010,7 +1011,7 @@ function initializeKeyboardShortcuts() {
                 parts[parts.length - 1] += '?' + params[1];
             }
             window.location = parts.join('/');
-        } else if (!ignore && (key === 's' || key === 't' || key === 'p' || key === 'j' || key === 'c')) {
+        } else if (!ignore && validKeys.has(key)) {
             if (e.shiftKey && key === 's') {
                 window.location = domjudge_base_url + '/jury/scoreboard';
                 return;
@@ -1053,6 +1054,27 @@ function initializeKeyboardShortcuts() {
                     $body.on('keydown', oldFunc);
                     if (e.key === 'Enter') {
                         switch (type) {
+                            case 'd':
+                                if (editors) {
+                                    const editorId = Object.keys(editors)[0];
+                                    const diffEditor =  editors[editorId];
+                                    const select = diffEditor.submissionSelect;
+                                    if (typedSequence.length === 0) {
+                                        // Reset to no-diff.
+                                        select.selectedIndex = 0;
+                                        select.dispatchEvent(new Event('change'));
+                                        return;
+                                    }
+                                    const url = domjudge_base_url + `/jury/submissions/${typedSequence}`;
+                                    for (let i = 0; i < select.options.length; i++) {
+                                        if (select.options[i].dataset.url === url) {
+                                            select.selectedIndex = i;
+                                            select.dispatchEvent(new Event('change'));
+                                            return;
+                                        }
+                                    }
+                                }
+                                return;
                             case 's':
                                 type = 'submissions';
                                 break;
@@ -1308,7 +1330,7 @@ const disableButton = (btn) => {
     btn.ariaDisabled=true;
 }
 
-const editors = [];
+const editors = {};
 function initDiffEditor(editorId) {
     const wrapper = $(`#${editorId}-wrapper`);
 
@@ -1360,6 +1382,7 @@ function initDiffEditor(editorId) {
     const diffLink = diffTitle.querySelector('a.diff-link');
 
     const editor = {
+        'submissionSelect': select[0],
         'getDiffMode': () => {
             for (let radio of radios) {
                 if (radio.checked) {
@@ -1399,7 +1422,7 @@ function initDiffEditor(editorId) {
         });
 
         const selected = select[0].options[select[0].selectedIndex];
-        if (selected && selected.dataset.tag) {
+        if (!select[0].disabled && selected && selected.dataset.tag) {
             setDiffTag(selected.dataset.tag);
         }
 

webapp/public/style_domjudge.css

@@ -722,6 +722,7 @@ blockquote {
     padding: 20px;
     border-radius: 5px;
     z-index: 1001;
+    overflow: auto;
 }
 
 #keyhelp code {

webapp/src/Controller/API/TeamController.php

@@ -308,7 +308,8 @@ protected function getQueryBuilder(Request $request): QueryBuilder
             ->leftJoin('t.category', 'tc')
             ->leftJoin('t.contests', 'c')
             ->leftJoin('tc.contests', 'cc')
-            ->select('t, ta');
+            ->select('t, ta')
+            ->andWhere('t.enabled = 1');
 
         if ($request->query->has('category')) {
             $queryBuilder

webapp/src/Controller/Jury/TeamController.php

@@ -241,6 +241,10 @@ public function viewAction(
             throw new NotFoundHttpException(sprintf('Team with ID %s not found', $teamId));
         }
 
+        if (!$team->getEnabled()) {
+            $this->addFlash('danger', 'Team is disabled and currently excluded from the scoreboard');
+        }
+
         $data = [
             'refresh' => [
                 'after' => 15,

webapp/templates/jury/base.html.twig

@@ -70,6 +70,10 @@
         <code>k</code> go to the previous item, e.g. previous submission <br/>
         <br/>
 
+        <code>d</code> <code>↵</code> switch diff viewer to no diff <br/>
+        <code>d</code> <code>[0-9]+</code> <code>↵</code> switch to diff against a submission, e.g. <code>d42↵</code> shows diff against submission 42 <br/>
+        <br/>
+
         <code>s</code> <code>↵</code> open the list of submissions <br/>
         <code>s</code> <code>[0-9]+</code> <code>↵</code> open a specific submission, e.g. <code>s42↵</code> to go to submission 42 <br/>
         <br/>

webapp/templates/jury/partials/submission_diff.html.twig

@@ -26,7 +26,7 @@
             {% endif %}
             <div class="btn-group">
                 <a href="#" role="button" class="btn btn-secondary btn-sm pe-none" aria-disabled="true"><i class="fas fa-code-branch"></i></a>
-                <select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against">
+                <select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against" {%- if otherSubmissions is empty %}disabled="true" aria-disabled="true"{%- endif %}>
                     <option value="" data-tag="no-diff">No diff</option>
                     {%- for other in otherSubmissions %}
                         <option value="{{ other.submitid }}" data-url="{{ path('jury_submission', {submitId: other.submitid}) }}" {%- if other.tag %} data-tag="{{ other.tag }}" {%- endif %}>