Update source diff title dynamically

Author: Kevinjil

webapp/public/js/domjudge.js

@@ -1362,6 +1362,10 @@ function initDiffEditor(editorId) {
         }
     })
 
+    const diffTitle = document.getElementById(`${editorId}-title-diff`);
+    const diffTag = diffTitle.querySelector('span.diff-tag');
+    const diffLink = diffTitle.querySelector('a.diff-link');
+
     const editor = {
         'getDiffMode': () => {
             for (let radio of radios) {
@@ -1405,6 +1409,15 @@ function initDiffEditor(editorId) {
         if (selected && selected.dataset.tag) {
             setDiffTag(selected.dataset.tag);
         }
+
+        if (noDiff) {
+            diffTitle.style.display = 'none';
+        } else {
+            diffTitle.style.display = 'inline';
+            diffTag.innerText = selected.dataset.tag;
+            diffLink.href = selected.dataset.url;
+            diffLink.innerText = `s${submitId}`;
+        }
     };
     updateSelect(parseInt(select[0].value), select[0].value === "");
     editor.onDiffSelectChange(updateSelect);

webapp/public/style_jury.css

@@ -248,3 +248,7 @@ table.table-full-clickable-cell tr .table-button-head-right-right{
 .timebutton {
     min-width: 9em;
 }
+
+.diff-title {
+    display: none;
+}

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

@@ -31,7 +31,7 @@
                     <select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against">
                         <option value="" data-tag="no-diff">No diff</option>
                         {%- for other in otherSubmissions %}
-                        <option value="{{ other.submitid }}" {%- if other.tag %} data-tag="{{ other.tag }}" {%- endif %}>
+                        <option value="{{ other.submitid }}" data-url="{{ path('jury_submission', {submitId: other.submitid}) }}" {%- if other.tag %} data-tag="{{ other.tag }}" {%- endif %}>
                             s{{ other.submitid }} {%- if other.tag %} ({{ other.tag }}) {%- endif %}
                         </option>
                         {%- endfor %}

webapp/templates/jury/submission_source.html.twig

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-
+    {% set editor_id = "diffw" ~ submission.submitid %}
     <h1>
         Source code for submission
         <a href="{{ path('jury_submission', {submitId: submission.submitid}) }}">s{{ submission.submitid }}</a>
@@ -25,17 +25,15 @@
             )
         {% endif %}
 
-        {% if oldSubmission %}
-            and diff to previous submission
-            <a href="{{ path('jury_submission', {submitId: oldSubmission.submitid}) }}">
-                s{{ oldSubmission.submitid }}
-            </a>
-        {% endif %}
+        <span class="diff-title" id="{{editor_id}}-title-diff">
+            and diff to <span class="diff-tag"></span> submission
+            <a class="diff-link" href="#"></a>
+        </span>
     </h1>
 
     {%- if submission.entryPoint %}
         <p><b>Entry point</b>: {{ submission.entryPoint }}</p>
     {%- endif %}
 
-    {%- include 'jury/partials/submission_diff.html.twig' with {editor_id: "diffw" ~ submission.submitid} %}
+    {%- include 'jury/partials/submission_diff.html.twig' with {editor_id: editor_id} %}
 {% endblock %}