Merge branch 'develop' into chore/posting-header-footer-client-migration

ls1intum · Dec 19, 2024 · 75a30ef · 75a30ef
2 parents 14c955e + 0d0a9e9
commit 75a30ef
Show file tree

Hide file tree

Showing 36 changed files with 558 additions and 309 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id "idea"
     id "jacoco"
     id "org.springframework.boot" version "${spring_boot_version}"
-    id "io.spring.dependency-management" version "1.1.6"
+    id "io.spring.dependency-management" version "1.1.7"
     id "com.google.cloud.tools.jib" version "3.4.4"
     id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
     id "com.diffplug.spotless" version "6.25.0"
@@ -384,6 +384,13 @@ dependencies {
         exclude module: "spring-boot-starter-undertow"
     }
     implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}"
+
+    // Avoid security issues in Tomcat 10.1.33
+    implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcat_version}"
+    implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcat_version}"
+    implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcat_version}"
+    implementation "org.apache.tomcat:tomcat-annotations-api:${tomcat_version}"
+
     implementation "org.springframework.boot:spring-boot-starter-websocket:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}"
@@ -400,7 +407,7 @@ dependencies {
     implementation "org.springframework.cloud:spring-cloud-starter-config:${spring_cloud_version}"
     implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}"
 
-    implementation "io.netty:netty-all:4.1.115.Final"
+    implementation "io.netty:netty-all:4.1.116.Final"
     implementation "io.projectreactor.netty:reactor-netty:1.2.1"
     implementation "org.springframework:spring-messaging:${spring_framework_version}"
     implementation "org.springframework.retry:spring-retry:2.0.11"
@@ -451,7 +458,7 @@ dependencies {
     implementation "org.apfloat:apfloat:1.14.0"
 
     // use newest version of guava to avoid security issues through outdated dependencies
-    implementation "com.google.guava:guava:33.3.1-jre"
+    implementation "com.google.guava:guava:33.4.0-jre"
     implementation "com.sun.activation:jakarta.activation:2.0.1"
 
     // use newest version of gson to avoid security issues through outdated dependencies
@@ -607,7 +614,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.12-rc-1"
+    gradleVersion = "8.12-rc-2"
 }
 
 tasks.register("stage") {

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ jhipster_dependencies_version=8.7.2
 spring_boot_version=3.4.0
 spring_framework_version=6.2.1
 spring_cloud_version=4.2.0
-spring_security_version=6.4.1
+spring_security_version=6.4.2
 # TODO: upgrading to 6.6.x currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
 hibernate_version=6.4.10.Final
 # TODO: can we update to 5.x?
@@ -19,7 +19,8 @@ jwt_version=0.12.6
 jaxb_runtime_version=4.0.5
 hazelcast_version=5.5.0
 fasterxml_version=2.18.2
-jgit_version=7.1.0.202411261347-r
+# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update
+jgit_version=7.0.0.202409031743-r
 sshd_version=2.14.0
 checkstyle_version=10.21.0
 jplag_version=5.1.0
@@ -32,13 +33,14 @@ liquibase_version=4.30.0
 docker_java_version=3.4.1
 logback_version=1.5.12
 java_parser_version=3.26.2
-byte_buddy_version=1.15.10
+byte_buddy_version=1.15.11
 netty_version=4.1.115.Final
+tomcat_version=10.1.34
 
 # testing
 # make sure both versions are compatible
 junit_version=5.11.3
-junit_platform_version=1.11.3
+junit_platform_version=1.11.4
 mockito_version=5.14.2
 testcontainer_version=1.20.4
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/webapp/app/course/manage/course-management-exercises.component.html b/src/main/webapp/app/course/manage/course-management-exercises.component.html
@@ -10,11 +10,6 @@ <h3>
             <jhi-documentation-button [type]="documentationType" />
         </div>
         <div class="col text-end align-self-center">
-            @if (showBackToWizardModeButton) {
-                <button type="button" id="back-to-wizard" class="btn btn-secondary" (click)="goBackToWizardMode()">
-                    <fa-icon [icon]="faHandshakeAngle" />&nbsp;{{ 'artemisApp.lecture.wizardMode.backToWizard' | artemisTranslate }}
-                </button>
-            }
             <button id="toggleSearchButton" class="btn btn-primary" type="button" (click)="toggleSearch()">
                 {{ 'artemisApp.course.exercise.search.toggleButton.' + showSearch | artemisTranslate }}
             </button>

diff --git a/src/main/webapp/app/course/manage/course-management-exercises.component.ts b/src/main/webapp/app/course/manage/course-management-exercises.component.ts
@@ -1,10 +1,8 @@
-import { Component, ContentChild, OnInit, TemplateRef } from '@angular/core';
+import { Component, ContentChild, OnInit, TemplateRef, inject } from '@angular/core';
 import { Course } from 'app/entities/course.model';
-import { CourseManagementService } from './course-management.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { ExerciseFilter } from 'app/entities/exercise-filter.model';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
-import { faHandshakeAngle } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseType } from 'app/entities/exercise.model';
 
 @Component({
@@ -28,22 +26,13 @@ export class CourseManagementExercisesComponent implements OnInit {
     filteredModelingExercisesCount = 0;
     filteredFileUploadExercisesCount = 0;
     exerciseFilter: ExerciseFilter;
-    showBackToWizardModeButton = false;
-    lectureIdForGoingBack: number;
-    lectureWizardStepForGoingBack: number;
-
-    faHandshakeAngle = faHandshakeAngle;
 
     // extension points, see shared/extension-point
     @ContentChild('overrideGenerateAndImportButton') overrideGenerateAndImportButton: TemplateRef<any>;
     @ContentChild('overrideProgrammingExerciseCard') overrideProgrammingExerciseCard: TemplateRef<any>;
     @ContentChild('overrideNonProgrammingExerciseCard') overrideNonProgrammingExerciseCard: TemplateRef<any>;
 
-    constructor(
-        private courseService: CourseManagementService,
-        private router: Router,
-        private route: ActivatedRoute,
-    ) {}
+    private readonly route = inject(ActivatedRoute);
 
     /**
      * initializes course
@@ -55,12 +44,6 @@ export class CourseManagementExercisesComponent implements OnInit {
             }
         });
 
-        this.route.queryParams.subscribe((params) => {
-            this.showBackToWizardModeButton = params.shouldHaveBackButtonToWizard;
-            this.lectureIdForGoingBack = params.lectureId;
-            this.lectureWizardStepForGoingBack = params.step;
-        });
-
         this.exerciseFilter = new ExerciseFilter('');
     }
 
@@ -104,11 +87,4 @@ export class CourseManagementExercisesComponent implements OnInit {
     shouldHideExerciseCard(type: string): boolean {
         return !['all', type].includes(this.exerciseFilter.exerciseTypeSearch);
     }
-
-    goBackToWizardMode() {
-        this.router.navigate(['/course-management', this.course.id, 'lectures', this.lectureIdForGoingBack, 'edit'], {
-            queryParams: { shouldBeInWizardMode: 'true', shouldOpenCreateExercise: 'true', step: this.lectureWizardStepForGoingBack },
-            queryParamsHandling: '',
-        });
-    }
 }
diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts
@@ -33,6 +33,8 @@ import { FormulaAction } from 'app/shared/monaco-editor/model/actions/formula.ac
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit {
+    protected readonly faQuestionCircle = faQuestionCircle;
+
     readonly IncludedInOverallScore = IncludedInOverallScore;
     readonly documentationType: DocumentationType = 'FileUpload';
 
@@ -50,7 +52,6 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr
     fileUploadExercise: FileUploadExercise;
     backupExercise: FileUploadExercise;
     isSaving: boolean;
-    goBackAfterSaving = false;
     exerciseCategories: ExerciseCategory[];
     existingCategories: ExerciseCategory[];
     notificationText?: string;
@@ -59,19 +60,14 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr
     isImport: boolean;
     examCourseId?: number;
 
-    saveCommand: SaveExerciseCommand<FileUploadExercise>;
-
     formStatusSections: FormSectionStatus[];
 
-    // Subcriptions
+    // Subscriptions
     titleChannelNameComponentSubscription?: Subscription;
     pointsSubscription?: Subscription;
     bonusPointsSubscription?: Subscription;
     teamSubscription?: Subscription;
 
-    // Icons
-    faQuestionCircle = faQuestionCircle;
-
     constructor(
         private fileUploadExerciseService: FileUploadExerciseService,
         private modalService: NgbModal,
@@ -104,11 +100,6 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr
             this.examCourseId = getCourseId(fileUploadExercise);
         });
 
-        this.activatedRoute.queryParams.subscribe((params) => {
-            if (params.shouldHaveBackButtonToWizard) {
-                this.goBackAfterSaving = true;
-            }
-        });
         this.activatedRoute.url
             .pipe(
                 tap(
@@ -264,12 +255,6 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr
     private onSaveSuccess(exercise: Exercise) {
         this.isSaving = false;
 
-        if (this.goBackAfterSaving) {
-            this.navigationUtilService.navigateBack();
-
-            return;
-        }
-
         this.navigationUtilService.navigateForwardFromExerciseUpdateOrCreation(exercise);
     }
 

diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ModelingExerciseService } from './modeling-exercise.service';
@@ -70,7 +70,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
     isImport: boolean;
     isExamMode: boolean;
     semiAutomaticAssessmentAvailable = true;
-    goBackAfterSaving = false;
 
     formSectionStatus: FormSectionStatus[];
 
@@ -91,7 +90,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
         private exerciseGroupService: ExerciseGroupService,
         private eventManager: EventManager,
         private activatedRoute: ActivatedRoute,
-        private router: Router,
         private navigationUtilService: ArtemisNavigationUtilService,
         private changeDetectorRef: ChangeDetectorRef,
     ) {}
@@ -186,12 +184,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
             )
             .subscribe();
 
-        this.activatedRoute.queryParams.subscribe((params) => {
-            if (params.shouldHaveBackButtonToWizard) {
-                this.goBackAfterSaving = true;
-            }
-        });
-
         this.isSaving = false;
         this.notificationText = undefined;
     }
@@ -292,12 +284,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
         this.eventManager.broadcast({ name: 'modelingExerciseListModification', content: 'OK' });
         this.isSaving = false;
 
-        if (this.goBackAfterSaving) {
-            this.navigationUtilService.navigateBack();
-
-            return;
-        }
-
         this.navigationUtilService.navigateForwardFromExerciseUpdateOrCreation(exercise);
     }
 

diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts
@@ -52,7 +52,6 @@ export class QuizExerciseUpdateComponent extends QuizExerciseValidationDirective
     notificationText?: string;
 
     isImport = false;
-    goBackAfterSaving = false;
 
     /** Constants for 'Add existing questions' and 'Import file' features **/
     showExistingQuestions = false;
@@ -149,12 +148,6 @@ export class QuizExerciseUpdateComponent extends QuizExerciseValidationDirective
             this.isImport = true;
         }
 
-        this.route.queryParams.subscribe((params) => {
-            if (params.shouldHaveBackButtonToWizard) {
-                this.goBackAfterSaving = true;
-            }
-        });
-
         /** Query the courseService for the participationId given by the params */
         if (this.courseId) {
             this.courseService.find(this.courseId).subscribe((response: HttpResponse<Course>) => {
@@ -520,12 +513,6 @@ export class QuizExerciseUpdateComponent extends QuizExerciseValidationDirective
         this.savedEntity = cloneDeep(quizExercise);
         this.changeDetector.detectChanges();
 
-        if (this.goBackAfterSaving) {
-            this.navigationUtilService.navigateBack();
-
-            return;
-        }
-
         // Navigate back only if it's an import
         // If we edit the exercise, a user might just want to save the current state of the added quiz questions without going back
         if (this.isImport) {

diff --git a/...app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts b/...app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild, effect, inject, input, signal } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges, ViewChild, effect, inject, input, output, signal } from '@angular/core';
 import { Course, isCommunicationEnabled } from 'app/entities/course.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
@@ -22,8 +22,8 @@ export class ExerciseTitleChannelNameComponent implements OnChanges {
 
     @ViewChild(TitleChannelNameComponent) titleChannelNameComponent: TitleChannelNameComponent;
 
-    @Output() onTitleChange = new EventEmitter<string>();
-    @Output() onChannelNameChange = new EventEmitter<string>();
+    onTitleChange = output<string>();
+    onChannelNameChange = output<string>();
 
     private readonly exerciseService: ExerciseService = inject(ExerciseService);
 

diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts
@@ -67,7 +67,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView
     examCourseId?: number;
     isExamMode: boolean;
     isImport = false;
-    goBackAfterSaving = false;
     AssessmentType = AssessmentType;
     isAthenaEnabled$: Observable<boolean> | undefined;
 
@@ -170,12 +169,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView
             )
             .subscribe();
 
-        this.activatedRoute.queryParams.subscribe((params) => {
-            if (params.shouldHaveBackButtonToWizard) {
-                this.goBackAfterSaving = true;
-            }
-        });
-
         this.isAthenaEnabled$ = this.athenaService.isEnabled();
 
         this.isSaving = false;
@@ -278,12 +271,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView
         this.eventManager.broadcast({ name: 'textExerciseListModification', content: 'OK' });
         this.isSaving = false;
 
-        if (this.goBackAfterSaving) {
-            this.navigationUtilService.navigateBack();
-
-            return;
-        }
-
         this.navigationUtilService.navigateForwardFromExerciseUpdateOrCreation(exercise);
     }
 

diff --git a/...main/webapp/app/lecture/close-edit-lecture-dialog/close-edit-lecture-modal.component.html b/...main/webapp/app/lecture/close-edit-lecture-dialog/close-edit-lecture-modal.component.html
@@ -0,0 +1,34 @@
+<div class="modal-header">
+    <h4 class="modal-title" jhiTranslate="artemisApp.lecture.dismissChangesModal.title"></h4>
+</div>
+<div class="modal-body">
+    <span jhiTranslate="artemisApp.lecture.dismissChangesModal.message" class="fw-bold"></span><br />
+    <!--    check if translation should be singular or plural, to be exchanged
+        with computed signals once input signals are supported with ng-bootstrap modals -->
+    @if (hasUnsavedChangesInTitleSection && hasUnsavedChangesInPeriodSection) {
+        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionsThatContainUnsavedChangesPlural"></span>
+    } @else {
+        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionsThatContainUnsavedChangesSingular"></span>
+    }
+    <ul>
+        @if (hasUnsavedChangesInTitleSection) {
+            <li>
+                <span jhiTranslate="artemisApp.lecture.wizardMode.steps.titleStepTitle"></span>
+            </li>
+        }
+        @if (hasUnsavedChangesInPeriodSection) {
+            <li>
+                <span jhiTranslate="artemisApp.lecture.wizardMode.steps.periodStepTitle"></span>
+            </li>
+        }
+    </ul>
+</div>
+<div class="modal-footer">
+    <button class="btn btn-default" (click)="closeWindow(true)">
+        <span jhiTranslate="entity.action.discardChanges"></span>
+    </button>
+    <button type="button" (click)="closeWindow(false)" class="btn btn-primary" type="submit">
+        <fa-icon [icon]="faTimes" />
+        <span class="ms-1" jhiTranslate="entity.action.cancel"></span>
+    </button>
+</div>