Development: Fix an issue with the exercise selection when navigating…

… into the course
ls1intum · Nov 3, 2024 · e0c4e47 · e0c4e47
1 parent bbf19a0
commit e0c4e47
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 207 deletions.
diff --git a/src/main/webapp/app/lti/lti13-exercise-launch.component.ts b/src/main/webapp/app/lti/lti13-exercise-launch.component.ts
@@ -146,7 +146,7 @@ export class Lti13ExerciseLaunchComponent implements OnInit {
     }
 
     replaceWindowLocationWrapper(url: string): void {
-        this.ltiService.setLti(true);
+        this.ltiService.setShownViaLti(true);
         this.themeService.applyThemeExplicitly(Theme.LIGHT);
         const path = new URL(url).pathname;
 

diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex justify-content-between horizontal-scroll">
     @if (course) {
-        @if (!isLti) {
+        @if (!isShownViaLti) {
             <div [ngClass]="{ 'sidebar-collapsed': isCollapsed }">
                 <jhi-sidebar
                     [itemSelected]="exerciseSelected"
@@ -14,7 +14,7 @@
         }
 
         @if (exerciseSelected) {
-            <div class="vw-100 module-bg rounded-3" [ngStyle]="isLti ? { height: '90vh', position: 'relative' } : {}">
+            <div class="vw-100 module-bg rounded-3" [ngStyle]="isShownViaLti ? { height: '90vh', position: 'relative' } : {}">
                 <router-outlet (deactivate)="onSubRouteDeactivate()" />
             </div>
         } @else {

diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts b/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts
@@ -55,7 +55,7 @@ export class CourseExercisesComponent implements OnInit, OnDestroy {
     sidebarData: SidebarData;
     sidebarExercises: SidebarCardElement[] = [];
     isCollapsed = false;
-    isLti = false;
+    isShownViaLti = false;
 
     protected readonly DEFAULT_COLLAPSE_STATE = DEFAULT_COLLAPSE_STATE;
     protected readonly DEFAULT_SHOW_ALWAYS = DEFAULT_SHOW_ALWAYS;
@@ -88,8 +88,8 @@ export class CourseExercisesComponent implements OnInit, OnDestroy {
 
         this.exerciseForGuidedTour = this.guidedTourService.enableTourForCourseExerciseComponent(this.course, courseExerciseOverviewTour, true);
 
-        this.ltiSubscription = this.ltiService.isLti$.subscribe((isLti) => {
-            this.isLti = isLti;
+        this.ltiSubscription = this.ltiService.isShownViaLti$.subscribe((isShownViaLti) => {
+            this.isShownViaLti = isShownViaLti;
         });
 
         // If no exercise is selected navigate to the lastSelected or upcoming exercise

diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html
diff --git a/src/main/webapp/app/overview/course-overview.component.ts b/src/main/webapp/app/overview/course-overview.component.ts
@@ -130,7 +130,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit
     isExamStarted = false;
     private examStartedSubscription: Subscription;
     readonly MIN_DISPLAYED_COURSES: number = 6;
-    isLti = false;
+    isShownViaLti = false;
     private ltiSubscription: Subscription;
 
     // Properties to track hidden items for dropdown menu
@@ -255,8 +255,8 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit
         this.updateVisibleNavbarItems(window.innerHeight);
         await this.updateRecentlyAccessedCourses();
         this.isSidebarCollapsed = this.activatedComponentReference?.isCollapsed ?? false;
-        this.ltiSubscription = this.ltiService.isLti$.subscribe((isLti) => {
-            this.isLti = isLti;
+        this.ltiSubscription = this.ltiService.isShownViaLti$.subscribe((isShownViaLti) => {
+            this.isShownViaLti = isShownViaLti;
         });
     }
 

diff --git a/src/main/webapp/app/shared/layouts/main/main.component.html b/src/main/webapp/app/shared/layouts/main/main.component.html
@@ -2,12 +2,12 @@
 <div
     id="page-wrapper"
     class="page-wrapper"
-    [ngClass]="{ 'footer-height-dev': !isProduction || isTestServer, 'no-padding': isLti }"
+    [ngClass]="{ 'footer-height-dev': !isProduction || isTestServer, 'no-padding': isShownViaLti }"
     [ngStyle]="{ 'overflow-y': !isTestRunExam && isExamStarted ? 'hidden' : 'auto' }"
     cdkScrollable
 >
     <jhi-page-ribbon />
-    @if (showSkeleton && !isLti) {
+    @if (showSkeleton && !isShownViaLti) {
         <div class="sticky-top">
             <router-outlet name="navbar" />
         </div>
@@ -23,7 +23,7 @@
         <router-outlet />
     }
     <jhi-notification-popup />
-    @if (showSkeleton && !isLti) {
+    @if (showSkeleton && !isShownViaLti) {
         <div>
             @if (isTestRunExam || !isExamStarted) {
                 <jhi-footer [ngClass]="{ 'footer-height-dev': !isProduction || isTestServer }" />

diff --git a/src/main/webapp/app/shared/layouts/main/main.component.ts b/src/main/webapp/app/shared/layouts/main/main.component.ts
@@ -33,7 +33,7 @@ export class JhiMainComponent implements OnInit, OnDestroy {
     isExamStarted: boolean = false;
     isTestRunExam: boolean = false;
     isCourseOverview: boolean = false;
-    isLti: boolean = false;
+    isShownViaLti: boolean = false;
 
     constructor(
         private jhiLanguageHelper: JhiLanguageHelper,
@@ -124,8 +124,8 @@ export class JhiMainComponent implements OnInit, OnDestroy {
             this.isCourseOverview = isPresent;
         });
 
-        this.ltiSubscription = this.ltiService.isLti$.subscribe((isLti) => {
-            this.isLti = isLti;
+        this.ltiSubscription = this.ltiService.isShownViaLti$.subscribe((isShownViaLti) => {
+            this.isShownViaLti = isShownViaLti;
         });
 
         this.themeService.initialize();

diff --git a/src/main/webapp/app/shared/service/lti.service.ts b/src/main/webapp/app/shared/service/lti.service.ts
@@ -6,10 +6,10 @@ import { BehaviorSubject } from 'rxjs';
 })
 export class LtiService {
     constructor() {}
-    private ltiSubject = new BehaviorSubject<boolean>(false);
-    isLti$ = this.ltiSubject.asObservable();
+    private shownViaLtiSubject = new BehaviorSubject<boolean>(false);
+    isShownViaLti$ = this.shownViaLtiSubject.asObservable();
 
-    setLti(isLti: boolean) {
-        this.ltiSubject.next(isLti);
+    setShownViaLti(shownViaLti: boolean) {
+        this.shownViaLtiSubject.next(shownViaLti);
     }
 }
diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts
@@ -214,7 +214,7 @@ describe('CourseOverviewComponent', () => {
             .then(() => {
                 fixture = TestBed.createComponent(CourseOverviewComponent);
                 component = fixture.componentInstance;
-                component.isLti = false;
+                component.isShownViaLti = false;
                 courseSidebarService = TestBed.inject(CourseSidebarService);
                 courseService = TestBed.inject(CourseManagementService);
                 courseStorageService = TestBed.inject(CourseStorageService);