Merge remote-tracking branch 'origin/develop' into bugfix/long-feedba…

…ck-not-beeing-displayed

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java

angular.json

@@ -44,9 +44,7 @@
               "react-is",
               "rfdc",
               "shallowequal",
-              "showdown-highlight",
-              "showdown-katex",
-              "showdown",
+              "markdown-it-class",
               "smoothscroll-polyfill",
               "sockjs-client",
               "use-sync-external-store/shim",

docs/user/markdown-support.rst

@@ -9,7 +9,7 @@ Markdown Support
 
 `Markdown <https://daringfireball.net/projects/markdown/>`__ is an easy-to-read, easy-to-write syntax for formatting plain text.
 
-A markdown playground can be found  `here <http://demo.showdownjs.com/>`__.
+A markdown playground can be found  `here <https://markdown-it.github.io/>`__.
 
 Artemis extends the basic `Markdown <https://daringfireball.net/projects/markdown/>`__ syntax to support Artemis-specific features. This Artemis flavored Markdown is used to format text content across the platform using an integrated markdown editor.
 
@@ -52,9 +52,9 @@ Markdown is also supported in the context of :ref:`communicating<communication>`
 Supported Syntax
 ^^^^^^^^^^^^^^^^
 
-The integrated markdown editor uses `Showdown <https://github.com/showdownjs/showdown>`__. A quick description of the supported syntax can be found `here <https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax>`__.
+The integrated markdown editor uses `MarkdownIt <https://github.com/markdown-it/markdown-it>`__. A quick description of the supported syntax can be found `here <https://www.markdownguide.org/basic-syntax/>`__.
 
-The following Showdown extensions are activated:
+The following Plugins are activated:
 
-- `Showdown Katex <https://obedm503.github.io/showdown-katex>`__ to render LaTeX math and AsciiMath using KaTeX.
-- `Showdown Highlight <https://github.com/Bloggify/showdown-highlight>`__ for syntax highlighting in code blocks.
+- `MarkdownIt Katex <https://github.com/microsoft/vscode-markdown-it-katex>`__ to render LaTeX math and AsciiMath using KaTeX.
+- `MarkdownIt HighlightJS <https://github.com/valeriangalliat/markdown-it-highlightjs>`__ for syntax highlighting in code blocks.

package.json

@@ -41,6 +41,7 @@
         "@swimlane/ngx-charts": "20.5.0",
         "@swimlane/ngx-graph": "8.4.0",
         "@vscode/codicons": "0.0.36",
+        "@vscode/markdown-it-katex": "1.1.0",
         "bootstrap": "5.3.3",
         "compare-versions": "6.1.1",
         "core-js": "3.38.1",
@@ -57,6 +58,9 @@
         "js-video-url-parser": "0.5.1",
         "jszip": "3.10.1",
         "lodash-es": "4.17.21",
+        "markdown-it": "14.1.0",
+        "markdown-it-class": "1.0.0",
+        "markdown-it-highlightjs": "4.2.0",
         "mobile-drag-drop": "3.0.0-rc.0",
         "monaco-editor": "0.52.0",
         "ngx-infinite-scroll": "18.0.0",
@@ -65,15 +69,13 @@
         "pdfjs-dist": "4.7.76",
         "posthog-js": "1.176.0",
         "rxjs": "7.8.1",
-        "showdown": "2.1.0",
-        "showdown-highlight": "3.1.0",
-        "showdown-katex": "0.6.0",
         "simple-statistics": "7.8.7",
         "smoothscroll-polyfill": "0.4.4",
         "sockjs-client": "1.6.1",
         "split.js": "1.6.5",
         "ts-cacheable": "1.0.10",
         "tslib": "2.8.0",
+        "turndown": "7.2.0",
         "uuid": "10.0.0",
         "webstomp-client": "1.2.6",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -102,13 +104,9 @@
         },
         "express": "5.0.1",
         "jsdom": "25.0.1",
-        "katex": "0.16.11",
         "postcss": "8.4.47",
         "rimraf": "6.0.1",
         "semver": "7.6.3",
-        "showdown-katex": {
-            "showdown": "2.1.0"
-        },
         "tough-cookie": "5.0.0",
         "vite": "5.4.10",
         "webpack-dev-middleware": "7.4.2",
@@ -134,11 +132,12 @@
         "@types/dompurify": "3.0.5",
         "@types/jest": "29.5.14",
         "@types/lodash-es": "4.17.12",
+        "@types/markdown-it": "14.1.2",
         "@types/node": "22.7.9",
         "@types/papaparse": "5.3.15",
-        "@types/showdown": "2.0.6",
         "@types/smoothscroll-polyfill": "0.3.4",
         "@types/sockjs-client": "1.5.4",
+        "@types/turndown": "5.0.5",
         "@types/uuid": "10.0.0",
         "@typescript-eslint/eslint-plugin": "8.11.0",
         "@typescript-eslint/parser": "8.11.0",

src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java

@@ -1,14 +1,18 @@
 package de.tum.cit.aet.artemis.atlas.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import de.tum.cit.aet.artemis.atlas.domain.LearningObject;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency;
@@ -21,6 +25,8 @@
 /**
  * Spring Data JPA repository for the {@link CourseCompetency} entity.
  */
+@Profile(PROFILE_CORE)
+@Repository
 public interface CourseCompetencyRepository extends ArtemisJpaRepository<CourseCompetency, Long> {
 
     @Query("""

src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java

@@ -1,11 +1,15 @@
 package de.tum.cit.aet.artemis.atlas.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite;
 import de.tum.cit.aet.artemis.core.domain.Course;
@@ -14,10 +18,10 @@
 /**
  * Spring Data JPA repository for the {@link Prerequisite} entity.
  */
+@Profile(PROFILE_CORE)
+@Repository
 public interface PrerequisiteRepository extends ArtemisJpaRepository<Prerequisite, Long> {
 
-    List<Prerequisite> findAllByCourseIdOrderById(long courseId);
-
     @Query("""
             SELECT p
             FROM Prerequisite p

src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java

@@ -1,11 +1,17 @@
 package de.tum.cit.aet.artemis.communication.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Repository;
 
 import de.tum.cit.aet.artemis.communication.domain.Post;
 
+@Profile(PROFILE_CORE)
+@Repository
 public interface CustomPostRepository {
 
     Page<Long> findPostIdsWithSpecification(Specification<Post> specification, Pageable pageable);

src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java

@@ -1,13 +1,20 @@
 package de.tum.cit.aet.artemis.core.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
 import java.util.List;
 
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Repository;
+
 import de.tum.cit.aet.artemis.core.domain.Authority;
 import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
 
 /**
  * Spring Data JPA repository for the Authority entity.
  */
+@Profile(PROFILE_CORE)
+@Repository
 public interface AuthorityRepository extends ArtemisJpaRepository<Authority, String> {
 
     /**

src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java

@@ -1,7 +1,14 @@
 package de.tum.cit.aet.artemis.core.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Repository;
+
 import de.tum.cit.aet.artemis.core.domain.MigrationChangelog;
 import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
 
+@Profile(PROFILE_CORE)
+@Repository
 public interface MigrationChangeRepository extends ArtemisJpaRepository<MigrationChangelog, String> {
 }

src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java

@@ -1,5 +1,6 @@
 package de.tum.cit.aet.artemis.core.repository;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD;
 
 import java.time.Instant;
@@ -9,19 +10,23 @@
 
 import jakarta.validation.constraints.NotNull;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent;
 import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
 
 /**
  * Spring Data JPA repository for the PersistentAuditEvent entity.
  */
+@Profile(PROFILE_CORE)
+@Repository
 public interface PersistenceAuditEventRepository extends ArtemisJpaRepository<PersistentAuditEvent, Long> {
 
     @EntityGraph(type = LOAD, attributePaths = { "data" })