Handle renaming of single-file submissions

Author: Kevinjil

webapp/public/js/domjudge.js

@@ -1362,6 +1362,33 @@ function initDiffEditor(editorId) {
             const element = wrapper.find(".nav-link[data-rank]")[rank].querySelector('.fa-fw');
             element.className = 'fas fa-fw fa-' + icon;
         },
+        'renamedFrom': (rank, oldName) => {
+            const navItem = wrapper.find(".nav-link[data-rank]")[rank];
+            let renamedFromName = navItem.querySelector('.renamed');
+            let arrow = navItem.querySelector('.fa-arrow-right');
+            if (oldName === undefined) {
+                if (renamedFromName) {
+                    navItem.removeChild(renamedFromName);
+                }
+                if (arrow) {
+                    navItem.removeChild(arrow);
+                }
+                return;
+            }
+
+            if (!renamedFromName) {
+                renamedFromName = document.createElement('span');
+                renamedFromName.className = 'renamed';
+                navItem.insertBefore(renamedFromName, navItem.childNodes[1]);
+            }
+            renamedFromName.innerText = ` ${oldName} `;
+
+            if (!arrow) {
+                arrow = document.createElement('i');
+                arrow.className = 'fas fa-arrow-right';
+                navItem.insertBefore(arrow, navItem.childNodes[2]);
+            }
+        },
         'onDiffModeChange': (f) => {
             radios.change((e) => {
                 const diffMode = e.target.value;
@@ -1424,16 +1451,20 @@ function initDiffEditorTab(editorId, diffId, rank, models, modifiedModel) {
     editors[editorId].onDiffModeChange(updateMode);
 
     const updateSelect = (submitId, noDiff) => {
+        const model = models[submitId] ??= {'model': empty};
         if (!noDiff) {
-            const model = models[submitId];
-            if (model === undefined) {
-                models[submitId] = {'model': empty};
-            } else if (model !== undefined && !model['model']) {
+            if (!model['model']) {
                 // TODO: show source code instead of diff to empty file?
                 model['model'] = monaco.editor.createModel(model['source'], undefined, monaco.Uri.file("test/" + submitId + "/" + model['filename']));
             }
         }
 
+        if (noDiff || !model['renamedFrom']) {
+            editors[editorId].renamedFrom(rank, undefined);
+        } else {
+            editors[editorId].renamedFrom(rank, model['renamedFrom']);
+        }
+
         diffEditor.updateOptions({
             renderOverviewRuler: !noDiff,
         });
@@ -1445,7 +1476,6 @@ function initDiffEditorTab(editorId, diffId, rank, models, modifiedModel) {
             // Reset the diff mode to the currently selected mode.
             updateMode(editors[editorId].getDiffMode())
         }
-        // TODO: handle single-file submission case with renamed file.
         const oldViewState = diffEditor.saveViewState();
         diffEditor.setModel({
             original: noDiff ? modifiedModel : models[submitId]['model'],

webapp/src/Controller/Jury/SubmissionController.php

@@ -906,7 +906,27 @@ public function sourceAction(
         foreach ($oldFiles as $f) {
             $submitId = $f->getSubmission()->getSubmitid();
             $otherFiles[$submitId] ??= [];
-            $otherFiles[$submitId][$f->getFilename()] = $f;
+            $otherFiles[$submitId][$f->getFilename()] = [
+                'filename' => $f->getFilename(),
+                'source'   => mb_check_encoding($f->getSourcecode(), 'UTF-8') ? $f->getSourcecode() : "Could not display file as UTF-8, is it binary?",
+            ];
+        }
+
+        // Handle file renaming for a single-file submission.
+        if (count($files) === 1) {
+            $f = $files[0];
+            foreach ($otherSubmissions as $s) {
+                $sf = $otherFiles[$s->getSubmitid()];
+                if (count($sf) === 1 && !array_key_exists($f->getFilename(), $sf)) {
+                    $oldName = array_key_first($sf);
+                    $otherFiles[$s->getSubmitid()] = [
+                        $f->getFilename() => [
+                            'renamedFrom' => $oldName,
+                            ...$sf[$oldName]
+                        ],
+                    ];
+                }
+            }
         }
 
         return $this->render('jury/submission_source.html.twig', [

webapp/src/Twig/TwigExtension.php

@@ -978,15 +978,9 @@ public function showDiff(string $editorId, string $diffId, SubmissionFile $newFi
 
         $others = [];
         foreach ($otherFiles as $submissionId => $files) {
-            foreach ($files as $f) {
-                // TODO: this renames the old file to multiple files, need more data in `showDiff`.
-                if (($newFile->getRank() === 1 && count($files) === 1) || ($f->getFilename() == $newFile->getFilename())) {
-                    // TODO: add `tag` containing `previous` / `original`
-                    $others[$submissionId] = [
-                        'filename' => $f->getFilename(),
-                        'source'   => mb_check_encoding($f->getSourcecode(), 'UTF-8') ? $f->getSourcecode() : "Could not display file as UTF-8, is it binary?",
-                    ];
-                }
+            if (isset($files[$newFile->getFilename()])) {
+                // TODO: add `tag` containing `previous` / `original`
+                $others[$submissionId] = $files[$newFile->getFilename()];
             }
         }