Add 'Original Version' button for instructors

src/main/java/de/tum/cit/aet/artemis/core/service/FilePathService.java

@@ -248,6 +248,9 @@ public static URI publicPathForActualPath(Path path, @Nullable Long entityId) {
     }
 
     private static URI publicPathForActualAttachmentUnitFilePath(Path path, String filename, String id) {
+        if (path.toString().contains("/student")) {
+            return URI.create(String.format("/api/files/attachments/attachment-unit/%s/student/%s", id, filename));
+        }
         if (!path.toString().contains("/slide")) {
             return URI.create("/api/files/attachments/attachment-unit/" + id + "/" + filename);
         }

src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java

@@ -476,7 +476,7 @@ public ResponseEntity<byte[]> getLecturePdfAttachmentsMerged(@PathVariable Long
      * @return The requested file, 403 if the logged-in user is not allowed to access it, or 404 if the file doesn't exist
      */
     @GetMapping("files/attachments/attachment-unit/{attachmentUnitId}/*")
-    @EnforceAtLeastEditorInCourse
+    @EnforceAtLeastInstructor
     public ResponseEntity<byte[]> getAttachmentUnitAttachment(@PathVariable Long attachmentUnitId) {
         log.debug("REST request to get the file for attachment unit {} for students", attachmentUnitId);
         AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId);
@@ -580,7 +580,7 @@ public ResponseEntity<byte[]> getAttachmentUnitStudentVersion(@PathVariable Long
 
         // check if hidden link is available in the attachment
         String studentVersion = attachment.getStudentVersion();
-        if (studentVersion == null) {
+        if (attachment.getStudentVersion() == null) {
             return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
         }
 

src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java

@@ -135,7 +135,7 @@ public ResponseEntity<Attachment> updateAttachment(@PathVariable Long attachment
         if (studentVersion != null) {
             // Update student version of attachment
             Path basePath = FilePathService.getAttachmentUnitFilePath().resolve(originalAttachment.getAttachmentUnit().getId().toString());
-            Path savePath = fileService.saveFile(studentVersion, basePath, true);
+            Path savePath = fileService.saveFile(studentVersion, basePath.resolve("student"), true);
             attachment.setStudentVersion(FilePathService.publicPathForActualPath(savePath, originalAttachment.getAttachmentUnit().getId()).toString());
 
             // Delete the old student version

src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.html

@@ -2,12 +2,14 @@
     [lectureUnit]="lectureUnit()"
     [icon]="getAttachmentIcon()"
     [showViewIsolatedButton]="true"
+    [showOriginalVersionButton]="!!lectureUnit().attachment?.studentVersion"
     [viewIsolatedButtonLabel]="'artemisApp.attachmentUnit.download'"
     [viewIsolatedButtonIcon]="faDownload"
     [isPresentationMode]="isPresentationMode()"
     (onCompletion)="toggleCompletion($event)"
     (onCollapse)="toggleCollapse($event)"
-    (onShowIsolated)="handleDownload()"
+    (onShowIsolated)="handleDownload(false)"
+    (onShowOriginalVersion)="handleDownload(true)"
 >
     @if (lectureUnit().attachment?.uploadDate) {
         <div>

src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.ts

@@ -44,15 +44,19 @@ export class AttachmentUnitComponent extends LectureUnitDirective<AttachmentUnit
     }
 
     /**
-     * Downloads the file
+     * Downloads the file as the student version if available, otherwise the instructor version
+     * If it is not the student view, it always downloads the original version
      */
-    handleDownload() {
+    handleDownload(originalVersion: boolean) {
         this.logEvent();
 
-        const link = this.lectureUnit().attachment?.studentVersion || this.lectureUnit().attachment?.link; // Prefer studentVersion if available
+        const attachment = this.lectureUnit().attachment!;
+
+        // Determine the link based on the originalVersion flag and the availability of a student version
+        const link = originalVersion ? attachment.link! : attachment.studentVersion || this.fileService.createStudentLink(attachment.link!);
+
         if (link) {
-            const link = this.lectureUnit().attachment!.link!;
-            this.fileService.downloadFileByAttachmentName(link, this.lectureUnit().attachment!.name!);
+            this.fileService.downloadFileByAttachmentName(link, attachment.name!);
             this.onCompletion.emit({ lectureUnit: this.lectureUnit(), completed: true });
         }
     }

src/main/webapp/app/overview/course-lectures/lecture-unit/lecture-unit.component.html

@@ -13,6 +13,12 @@ <h5 class="m-0">{{ lectureUnit().name ?? '' }}</h5>
                 }
             </div>
             <div class="d-flex align-items-center">
+                @if (showOriginalVersionButton() && !isStudentPath()) {
+                    <button id="view-original-version-button" class="btn btn-sm btn-primary me-2" (click)="handleOriginalVersionView($event)">
+                        <fa-icon [icon]="faDownload" />
+                        <span class="d-none d-md-inline" [jhiTranslate]="'artemisApp.textUnit.originalVersion'"></span>
+                    </button>
+                }
                 @if (showViewIsolatedButton()) {
                     <button id="view-isolated-button" class="btn btn-sm btn-primary" (click)="handleIsolatedView($event)">
                         <fa-icon [icon]="viewIsolatedButtonIcon()" />

src/main/webapp/app/overview/course-lectures/lecture-unit/lecture-unit.component.ts

@@ -1,9 +1,10 @@
 import { Component, computed, input, output, signal } from '@angular/core';
-import { IconDefinition, faExternalLinkAlt, faSquare, faSquareCheck } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faDownload, faExternalLinkAlt, faSquare, faSquareCheck } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
+import { Router } from '@angular/router';
 
 @Component({
     selector: 'jhi-lecture-unit-card',
@@ -13,12 +14,18 @@ import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
     styleUrl: './lecture-unit.component.scss',
 })
 export class LectureUnitComponent {
+    constructor(private router: Router) {}
+
+    protected faDownload = faDownload;
     protected faSquareCheck = faSquareCheck;
     protected faSquare = faSquare;
 
     readonly lectureUnit = input.required<LectureUnit>();
     protected readonly icon = input.required<IconDefinition>();
 
+    readonly showOriginalVersionButton = input<boolean>(false);
+    readonly onShowOriginalVersion = output<void>();
+
     readonly showViewIsolatedButton = input<boolean>(false);
     readonly viewIsolatedButtonLabel = input<string>('artemisApp.textUnit.isolated');
     readonly viewIsolatedButtonIcon = input<IconDefinition>(faExternalLinkAlt);
@@ -32,6 +39,7 @@ export class LectureUnitComponent {
     readonly onCompletion = output<boolean>();
 
     readonly isVisibleToStudents = computed(() => this.lectureUnit().visibleToStudents);
+    readonly isStudentPath = computed(() => this.router.url.startsWith('/courses'));
 
     toggleCompletion(event: Event) {
         event.stopPropagation();
@@ -47,4 +55,9 @@ export class LectureUnitComponent {
         event.stopPropagation();
         this.onShowIsolated.emit();
     }
+
+    handleOriginalVersionView(event: Event) {
+        event.stopPropagation();
+        this.onShowOriginalVersion.emit();
+    }
 }

src/main/webapp/app/shared/http/file.service.ts

@@ -141,4 +141,14 @@ export class FileService {
     replaceAttachmentPrefixAndUnderscores(link: string): string {
         return link.replace(/AttachmentUnit_\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}_/, '').replace(/_/g, ' ');
     }
+
+    /**
+     * Returns the student version of the given link.
+     *
+     * @param link the file link
+     */
+    createStudentLink(link: string): string {
+        const lastSlashIndex = link.lastIndexOf('/');
+        return `${link.substring(0, lastSlashIndex)}/student${link.substring(lastSlashIndex)}`;
+    }
 }

src/main/webapp/i18n/en/lectureUnit.json

@@ -28,6 +28,7 @@
             "updated": "Text unit updated",
             "tooltip": "This is a text unit",
             "isolated": "View Isolated",
+            "originalVersion": "Original Version",
             "notReleasedTooltip": "Text only visible to teaching assistants and instructors. Release date:",
             "markdownHelp": "You can enter Markdown here. More information: ",
             "cachedMarkdown": "Artemis found some unsaved markdown in the local storage. Do you want to load it? Save Date:",