Store and restore preferred diff tag

Author: Kevinjil

webapp/public/js/domjudge.js

@@ -138,6 +138,20 @@ function setDiffMode(value)
     localStorage.setItem('domjudge_editor_diff_mode', value);
 }
 
+function getDiffTag()
+{
+    let diffTag = localStorage.getItem('domjudge_editor_diff_tag');
+    if (diffTag === undefined) {
+        return 'no-diff';
+    }
+    return diffTag;
+}
+
+function setDiffTag(value)
+{
+    localStorage.setItem('domjudge_editor_diff_tag', value);
+}
+
 // Send a notification if notifications have been enabled.
 // The options argument is passed to the Notification constructor,
 // except that the following tags (if found) are interpreted and
@@ -1295,10 +1309,23 @@ const editors = [];
 function initDiffEditor(editorId) {
     const wrapper = $(`#${editorId}-wrapper`);
 
-    // TODO: store and restore tag preference in local storage.
-    const initialSelect = "";
+    const initialTag = getDiffTag();
     const select = wrapper.find(".diff-select");
-    select[0].selectedIndex = 0;
+    for (let i = 0; i < select[0].options.length; i++) {
+        if (select[0].options[i].dataset.tag == initialTag) {
+            select[0].selectedIndex = i;
+            break;
+        }
+    }
+    // Fall back to other tagged diff if preferred tag is not available for this submission.
+    if (initialTag !== "no-diff" && select[0].selectedIndex === 0) {
+        for (let i = 1; i < select[0].options.length; i++) {
+            if (select[0].options[i].dataset.tag) {
+                select[0].selectedIndex = i;
+                break;
+            }
+        }
+    }
 
     const initialDiffMode = getDiffMode();
     const radios = wrapper.find(`.diff-mode > input[type='radio']`);
@@ -1368,9 +1395,15 @@ function initDiffEditor(editorId) {
         radios.each((_, radio) => {
             radio.disabled = noDiff;
         });
+
+        const selected = select[0].options[select[0].selectedIndex];
+        if (selected && selected.dataset.tag) {
+            setDiffTag(selected.dataset.tag);
+        }
+
         // TODO: add tab panes for deleted source files.
     };
-    updateSelect("", true);
+    updateSelect(select[0].value, select[0].value === "");
     editor.onDiffSelectChange(updateSelect);
 }
 
@@ -1390,6 +1423,13 @@ function initDiffEditorTab(editorId, diffId, rank, models, modifiedModel) {
         theme: getCurrentEditorTheme(),
     });
 
+    const updateMode = (diffMode) => {
+        diffEditor.updateOptions({
+            renderSideBySide: diffMode === 'side-by-side',
+        });
+    };
+    editors[editorId].onDiffModeChange(updateMode);
+
     const updateSelect = (submitId, noDiff) => {
         if (!noDiff) {
             const model = models[submitId];
@@ -1430,7 +1470,7 @@ function initDiffEditorTab(editorId, diffId, rank, models, modifiedModel) {
         })
     };
     editors[editorId].onDiffSelectChange(updateSelect);
-    updateSelect("", true);
+    updateSelect(editors[editorId].getDiffSelection(), editors[editorId].getDiffSelection() === "");
 
     const updateIcon = () => {
         const noDiff = editors[editorId].getDiffSelection() === "";
@@ -1449,11 +1489,4 @@ function initDiffEditorTab(editorId, diffId, rank, models, modifiedModel) {
         }
     }
     diffEditor.onDidUpdateDiff(updateIcon);
-
-    const updateMode = (diffMode) => {
-        diffEditor.updateOptions({
-            renderSideBySide: diffMode === 'side-by-side',
-        });
-    };
-    editors[editorId].onDiffModeChange(updateMode);
 }

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

@@ -24,16 +24,16 @@
                 <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">
-                        <option value="">No diff</option>
+                        <option value="" data-tag="no-diff">No diff</option>
                         {%- for other in otherSubmissions %}
-                        <option value="{{ other.submitid }}">
-                            {%- if originalSubmission and originalSubmission.submitid == other.submitid %}
-                            s{{ other.submitid }} (original)
-                            {%- elseif oldSubmission and oldSubmission.submitid == other.submitid %}
-                            s{{ other.submitid }} (previous)
-                            {%- else %}
-                            s{{ other.submitid }}
-                            {%- endif %}
+                        {%- set tag = "" %}
+                        {%- if originalSubmission and originalSubmission.submitid == other.submitid %}
+                            {%- set tag = "original" %}
+                        {%- elseif oldSubmission and oldSubmission.submitid == other.submitid %}
+                            {%- set tag = "previous" %}
+                        {%- endif %}
+                        <option value="{{ other.submitid }}" {%- if tag %} data-tag="{{ tag }}" {%- endif %}>
+                            s{{ other.submitid }} {%- if tag %} ({{ tag }}) {%- endif %}
                         </option>
                         {%- endfor %}
                     </select>