From e0c4e4702da7e9da0b529ec93a2f32f5c3f14378 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Sun, 3 Nov 2024 21:39:47 +0100 Subject: [PATCH] Development: Fix an issue with the exercise selection when navigating into the course --- .../lti/lti13-exercise-launch.component.ts | 2 +- .../course-exercises.component.html | 4 +- .../course-exercises.component.ts | 6 +- .../overview/course-overview.component.html | 380 +++++++++--------- .../app/overview/course-overview.component.ts | 6 +- .../shared/layouts/main/main.component.html | 6 +- .../app/shared/layouts/main/main.component.ts | 6 +- .../webapp/app/shared/service/lti.service.ts | 8 +- .../course/course-overview.component.spec.ts | 2 +- 9 files changed, 213 insertions(+), 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 index bbb1757c77f5..2c939e994279 100644 --- 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 index 9ff43b3e4857..bd8e5fceab3b 100644 --- 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 @@
@if (course) { - @if (!isLti) { + @if (!isShownViaLti) {
+
} @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 index 36366be86ff6..5f0adeed54b5 100644 --- 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 index 05ff39d44a36..2cd6c2c5c4ee 100644 --- a/src/main/webapp/app/overview/course-overview.component.html +++ b/src/main/webapp/app/overview/course-overview.component.html @@ -1,215 +1,221 @@ -
-
- - +
+ -
-
- -
-
- @if (course) { - @if (courses?.length) { -
+ +
+
+ +
+
+ @if (course) { + @if (courses?.length) { +
+ +
+ } @else { -
- } @else { - + } } - } -
- @for (course of courses; track course) { - - } -
-
- @if (!isNavbarCollapsed) { -
{{ course?.title }}
- } -
- -
-
-
    - @for (sidebarItem of sidebarItems; track sidebarItem) { -
  • - @if (sidebarItem.hasInOrionProperty && sidebarItem.showInOrionWindow !== undefined) { - - } @else { - +
    + @for (course of courses; track course) { + } -
    • - } -
  • -
    - -
    -
    • -
    - @for (hiddenItem of hiddenItems; track hiddenItem) { -
  • - @if (hiddenItem.hasInOrionProperty && hiddenItem.showInOrionWindow !== undefined) { - +
    • + @if (!isNavbarCollapsed) { +
    {{ course?.title }}
    + } +
+ +
+
+
    + @for (sidebarItem of sidebarItems; track sidebarItem) { +
  • + @if (sidebarItem.hasInOrionProperty && sidebarItem.showInOrionWindow !== undefined) { + } @else { - + }
    • } - @if (courseActionItems?.length && anyItemHidden) { - @for (courseActionItem of courseActionItems; track courseActionItem) { +
  • +
    + + +
    +
    • +
    + @for (hiddenItem of hiddenItems; track hiddenItem) {
  • - - - + @if (hiddenItem.hasInOrionProperty && hiddenItem.showInOrionWindow !== undefined) { + + } @else { + + }
    • } - } + @if (courseActionItems?.length && anyItemHidden) { + @for (courseActionItem of courseActionItems; track courseActionItem) { +
  • + + + +
    • + } + } +
    +
+
+
+ +
+ @if (courseActionItems?.length && !anyItemHidden) { +
+
  • + @for (courseActionItem of courseActionItems; track courseActionItem) { + + + + } +
    • +
    + } + +
    +
    + +
    - +
    - -
    - @if (courseActionItems?.length && !anyItemHidden) { -
    -
  • - @for (courseActionItem of courseActionItems; track courseActionItem) { - - - - } -
    • -
    - } - + + + @if (course) {
    -
    - - +
    + @if (hasSidebar) { + + } +
    {{ 'artemisApp.courseOverview.menu.' + pageTitle | artemisTranslate }}
    -
    -
    -
    - - - @if (course) { -
    -
    - @if (hasSidebar) { - - } -
    {{ 'artemisApp.courseOverview.menu.' + pageTitle | artemisTranslate }}
    + } + @if (showRefreshButton) { + + } +
    -
    - @if (isNotManagementView && course.isAtLeastTutor) { -
    - -
    - } - @if (showRefreshButton) { - +
    + @if (!hasSidebar) { + } + +
    + +
    -
    -
    - @if (!hasSidebar) { - - } - -
    - -
    -
    - } -     - + } + + +
    -
    - -
    - @if (!hasSidebar) { - - } - -
    - +} @else { + +
    + @if (!hasSidebar) { + + } + +
    + +
    -
    +} + diff --git a/src/main/webapp/app/overview/course-overview.component.ts b/src/main/webapp/app/overview/course-overview.component.ts index fd9546b0f355..fd9485c0efe3 100644 --- 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 index b50cac65becc..347161c8f31c 100644 --- 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 @@
    - @if (showSkeleton && !isLti) { + @if (showSkeleton && !isShownViaLti) {
    @@ -23,7 +23,7 @@ } - @if (showSkeleton && !isLti) { + @if (showSkeleton && !isShownViaLti) {
    @if (isTestRunExam || !isExamStarted) { diff --git a/src/main/webapp/app/shared/layouts/main/main.component.ts b/src/main/webapp/app/shared/layouts/main/main.component.ts index 5aa240c26df6..46f7727ecae3 100644 --- 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 index a493fffdd939..a838d4df18e5 100644 --- 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(false); - isLti$ = this.ltiSubject.asObservable(); + private shownViaLtiSubject = new BehaviorSubject(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 index f55313f59347..a7169fc98dc2 100644 --- 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);