Merge branch 'develop' into feature/playwright/improve-test-execution…

…-times
ls1intum · Nov 18, 2024 · b5caaf4 · b5caaf4
2 parents 18beef5 + 745c7f7
commit b5caaf4
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 363 deletions.
diff --git a/README.md b/README.md
@@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.7.1.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.7.2.war
 ```
 
 ## Architecture

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.7.1"
+version = "7.7.2"
 description = "Interactive Learning with Individual Feedback"
 
 java {

diff --git a/docs/dev/cypress.rst b/docs/dev/cypress.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -57,7 +57,6 @@ All these exercises are supposed to be run either live in the lecture with insta
    Guided Tour <dev/guided-tour>
    dev/testservers
    dev/docker
-   dev/cypress
    dev/playwright
    dev/open-source
    dev/local-moodle-setup-for-lti

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,8 +1,9 @@
-Sphinx==7.4.7
-sphinx-rtd-theme==2.0.0
-sphinx-autobuild==2024.9.19
-sphinxcontrib-bibtex==2.6.3
+alabaster==1.0.0
+docutils==0.21.2
 requests==2.32.3
-zipp==3.20.2
-docutils==0.20.1
+Sphinx==8.1.3
+sphinx-rtd-theme==3.0.2
+sphinx-autobuild==2024.10.3
+sphinxcontrib-bibtex==2.6.3
 urllib3==2.2.3
+zipp==3.21.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "7.7.1",
+    "version": "7.7.2",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",

diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java
@@ -24,6 +24,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -117,7 +118,7 @@ private String resolvePathPrefix() {
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = jHipsterProperties.getCors();
-        if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) {
+        if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) {
             log.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);

diff --git a/...ain/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/...ain/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java
@@ -338,11 +338,6 @@ Optional<ProgrammingExercise> findByIdWithEagerTestCasesStaticCodeAnalysisCatego
     Optional<ProgrammingExercise> findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndSolutionEntriesAndBuildConfig(
             @Param("exerciseId") long exerciseId);
 
-    default ProgrammingExercise findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfigElseThrow(long exerciseId)
-            throws EntityNotFoundException {
-        return getValueElseThrow(findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfig(exerciseId), exerciseId);
-    }
-
     @Query("""
             SELECT p
             FROM ProgrammingExercise p

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
@@ -85,15 +85,15 @@
         <ng-template #editorTitle>
             <span>
                 <span>{{ exercise?.title }}</span>
-                <span>&nbsp;[</span>
-                <span>{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}</span>
-                @if (exercise.bonusPoints) {
-                    <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-                }
-                @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
-                    <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
-                }
-                <span>]</span>
+                <span
+                    [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                    [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
+                ></span>
+                <span>
+                    @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
+                        <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
+                    }
+                </span>
             </span>
         </ng-template>
         <ng-template #editorToolbar>

diff --git a/...programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html b/...programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html
@@ -20,13 +20,15 @@
     <jhi-code-editor-container [participation]="selectedParticipation!" [buildable]="selectedRepository !== REPOSITORY.TEST" [course]="course" [allowHiddenFiles]="true">
         <div editorTitle>
             <span>{{ exercise?.title }}</span>
-            <!-- prettier-ignore -->
-            <span>&nbsp;[{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
-                <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-            }]
-            @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
-                <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore"/>
-            }</span>
+            <span
+                [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
+            ></span>
+            <span>
+                @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
+                    <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
+                }
+            </span>
         </div>
         <div editorTitleActions class="d-flex align-items-center ms-2">
             <jhi-programming-exercise-instructor-exercise-status

diff --git a/...webapp/app/exercises/programming/participate/code-editor-student-container.component.html b/...webapp/app/exercises/programming/participate/code-editor-student-container.component.html
@@ -33,10 +33,11 @@
         >
             <div editorTitle>
                 <span>{{ exercise?.title }}</span>
-                <!-- prettier-ignore -->
-                <span>&nbsp;[{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
-                        <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-                    }]
+                <span
+                    [jhiTranslate]="exercise?.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                    [translateValues]="{ points: exercise?.maxPoints, bonusPoints: exercise?.bonusPoints }"
+                ></span>
+                <span>
                     @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
                         <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
                     }