made link to button

ls1intum · Nov 28, 2024 · b3110c1 · b3110c1
1 parent c857506
commit b3110c1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html b/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html
@@ -98,31 +98,25 @@
         </ng-template>
         <ng-template #editorToolbar>
             <ng-container *jhiExtensionPoint="overrideExportGoToRepository">
+                @if (isAtLeastEditor && localVCEnabled && !isTestRun) {
+                    <a class="btn btn-secondary btn-sm me-2 open-repository-button" [routerLink]="localRepositoryLink" target="_blank" rel="noopener noreferrer">
+                        <fa-icon [icon]="faExternalLink" />
+                        <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.goToRepo"></span>
+                    </a>
+                }
                 <jhi-programming-assessment-repo-export
                     [programmingExercises]="[exercise]"
                     [singleParticipantMode]="true"
                     [participationIdList]="participation ? [participation!.id!] : []"
                 />
-                @if (isAtLeastEditor) {
-                    @if (!localVCEnabled) {
-                        <a
-                            class="ms-2 me-5"
-                            href="{{ participation?.userIndependentRepositoryUri }}"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.goToRepo"
-                        ></a>
-                    } @else {
-                        <a
-                            class="ms-2 me-5"
-                            [routerLink]="localRepositoryLink"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.goToRepo"
-                        >
-                            <fa-icon [icon]="faExternalLink" />
-                        </a>
-                    }
+                @if (isAtLeastEditor && !localVCEnabled) {
+                    <a
+                        class="ms-2 me-5"
+                        href="{{ participation?.userIndependentRepositoryUri }}"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.goToRepo"
+                    ></a>
                 }
             </ng-container>
             @if (participation) {

diff --git a/...bapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts b/...bapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts
@@ -198,14 +198,7 @@ export class CodeEditorTutorAssessmentContainerComponent implements OnInit, OnDe
                         const observable = this.repositoryFileService.getFilesWithContent();
                         // Set back to student participation
                         this.domainService.setDomain([DomainType.PARTICIPATION, this.participation]);
-                        this.localRepositoryLink = getLocalRepositoryLink(
-                            this.courseId,
-                            this.exerciseId,
-                            this.participation.id!,
-                            this.exerciseGroupId,
-                            this.examId,
-                            this.isTestRun,
-                        );
+                        this.localRepositoryLink = getLocalRepositoryLink(this.courseId, this.exerciseId, this.participation.id!, this.exerciseGroupId, this.examId);
                         return observable;
                     }),
                     tap((templateFilesObj) => {

diff --git a/src/main/webapp/app/utils/navigation.utils.ts b/src/main/webapp/app/utils/navigation.utils.ts
@@ -152,13 +152,10 @@ export const getExerciseDashboardLink = (courseId: number, exerciseId: number, e
         : ['/course-management', courseId.toString(), 'assessment-dashboard', exerciseId.toString()];
 };
 
-export const getLocalRepositoryLink = (courseId: number, exerciseId: number, participationId: number, exerciseGroupId: number = 0, examId = 0, isTestRun = false): string[] => {
-    if (isTestRun) {
-        return ['/course-management', courseId.toString(), 'exams', examId.toString(), 'test-runs', 'assess'];
-    }
+export const getLocalRepositoryLink = (courseId: number, exerciseId: number, participationId: number, exerciseGroupId: number = 0, examId = 0): string[] => {
     const suffix = ['programming-exercises', exerciseId.toString(), 'participations', participationId.toString(), 'repository'];
 
-    return examId > 0
+    return examId < 0
         ? ['/course-management', courseId.toString(), 'exams', examId.toString(), 'exercise-groups', exerciseGroupId.toString(), ...suffix]
         : ['/course-management', courseId.toString(), ...suffix];
 };