Merge branch 'develop' into feature/exam-mode/seating-distribution-algorithm

Author: SamuelRoettgermann

gradle/jacoco.gradle

@@ -1,6 +1,7 @@
 ext {
     // TODO: this should become 90% for INSTRUCTION and 0 for CLASS
-    AggregatedCoverageThresholds = ["INSTRUCTION": 0.865, "CLASS": 119]
+    //This also needs to be lowered if we merge nebula PRs
+    AggregatedCoverageThresholds = ["INSTRUCTION": 0.865, "CLASS": 123]
     // TODO: each module should achieve 90% for INSTRUCTION and 0 for CLASS
     ModuleCoverageThresholds = [
         "assessment"    :          ["INSTRUCTION": 0.926, "CLASS":  0],
@@ -22,6 +23,8 @@ ext {
         "quiz"          :          ["INSTRUCTION": 0.906, "CLASS":  2],
         "text"          :          ["INSTRUCTION": 0.947, "CLASS":  1],
         "tutorialgroup" :          ["INSTRUCTION": 0.915, "CLASS":  1],
+        //Adjust this after we merge the corresponding PRs
+        "nebula"        :          ["INSTRUCTION": 0.000, "CLASS":  6],
     ]
     // If no explicit modules defined -> generate reports and validate for each module
     reportedModules = includedModules.size() == 0

jest.config.js

@@ -97,7 +97,7 @@ module.exports = {
             statements: 89.66,
             branches: 75.85,
             functions: 83.68,
-            lines: 89.73    ,
+            lines: 89.73,
         },
     },
     // 'json-summary' reporter is used by supporting_scripts/code-coverage/module-coverage-client/check-client-module-coverage.mjs

package-lock.json

@@ -13,31 +13,31 @@
         "node_modules"
     ],
     "dependencies": {
-        "@angular/animations": "20.3.2",
-        "@angular/cdk": "20.2.5",
-        "@angular/common": "20.3.2",
-        "@angular/compiler": "20.3.2",
-        "@angular/core": "20.3.2",
-        "@angular/forms": "20.3.2",
-        "@angular/localize": "20.3.2",
-        "@angular/material": "20.2.5",
-        "@angular/platform-browser": "20.3.2",
-        "@angular/platform-browser-dynamic": "20.3.2",
-        "@angular/router": "20.3.2",
-        "@angular/service-worker": "20.3.2",
+        "@angular/animations": "20.3.3",
+        "@angular/cdk": "20.2.7",
+        "@angular/common": "20.3.3",
+        "@angular/compiler": "20.3.3",
+        "@angular/core": "20.3.3",
+        "@angular/forms": "20.3.3",
+        "@angular/localize": "20.3.3",
+        "@angular/material": "20.2.7",
+        "@angular/platform-browser": "20.3.3",
+        "@angular/platform-browser-dynamic": "20.3.3",
+        "@angular/router": "20.3.3",
+        "@angular/service-worker": "20.3.3",
         "@ctrl/ngx-emoji-mart": "9.3.0",
         "@danielmoncada/angular-datetime-picker": "20.0.0",
         "@fingerprintjs/fingerprintjs": "4.6.2",
         "@fortawesome/angular-fontawesome": "3.0.0",
-        "@fortawesome/fontawesome-svg-core": "7.0.1",
-        "@fortawesome/free-regular-svg-icons": "7.0.1",
-        "@fortawesome/free-solid-svg-icons": "7.0.1",
+        "@fortawesome/fontawesome-svg-core": "7.1.0",
+        "@fortawesome/free-regular-svg-icons": "7.1.0",
+        "@fortawesome/free-solid-svg-icons": "7.1.0",
         "@ls1intum/apollon": "3.4.3",
         "@ng-bootstrap/ng-bootstrap": "19.0.1",
         "@ngx-translate/core": "16.0.4",
         "@ngx-translate/http-loader": "16.0.1",
         "@primeuix/themes": "1.2.5",
-        "@sentry/angular": "10.16.0",
+        "@sentry/angular": "10.17.0",
         "@siemens/ngx-datatable": "24.3.0",
         "@swimlane/ngx-charts": "23.0.1",
         "@swimlane/ngx-graph": "11.0.0",
@@ -47,7 +47,7 @@
         "dayjs": "1.11.18",
         "diff-match-patch-typescript": "1.1.2",
         "dompurify": "3.2.7",
-        "emoji-js": "3.8.1",
+        "emoji-js": "3.9.0",
         "export-to-csv": "1.4.0",
         "fast-json-patch": "3.1.1",
         "franc-min": "6.2.0",
@@ -86,15 +86,15 @@
         "express": "5.1.0",
         "globals": "16.4.0",
         "jsdom": "26.1.0",
-        "katex": "0.16.22",
+        "katex": "0.16.23",
         "postcss": "8.5.6",
         "punycode": "2.3.1",
         "rimraf": "6.0.1",
         "semver": "7.7.2",
         "tmp": "0.2.5",
         "tough-cookie": "6.0.0",
-        "vite": "7.1.7",
-        "webpack": "5.101.3",
+        "vite": "7.1.9",
+        "webpack": "5.102.0",
         "webpack-dev-middleware": "7.4.5",
         "webpack-dev-server": "5.2.2",
         "word-wrap": "1.2.5",
@@ -103,30 +103,30 @@
     },
     "devDependencies": {
         "@angular-builders/jest": "20.0.0",
-        "@angular-devkit/build-angular": "20.3.3",
+        "@angular-devkit/build-angular": "20.3.4",
         "@angular-eslint/builder": "20.3.0",
         "@angular-eslint/eslint-plugin": "20.3.0",
         "@angular-eslint/schematics": "20.3.0",
         "@angular-eslint/template-parser": "20.3.0",
-        "@angular/build": "20.3.3",
-        "@angular/cli": "20.3.3",
-        "@angular/compiler-cli": "20.3.2",
-        "@angular/language-service": "20.3.2",
-        "@sentry/types": "10.16.0",
+        "@angular/build": "20.3.4",
+        "@angular/cli": "20.3.4",
+        "@angular/compiler-cli": "20.3.3",
+        "@angular/language-service": "20.3.3",
+        "@sentry/types": "10.17.0",
         "@types/d3-shape": "3.1.7",
         "@types/emoji-js": "3.5.2",
         "@types/jest": "29.5.14",
         "@types/lodash-es": "4.17.12",
         "@types/markdown-it": "14.1.2",
-        "@types/node": "24.5.2",
+        "@types/node": "24.6.2",
         "@types/pako": "2.0.4",
         "@types/papaparse": "5.3.16",
         "@types/turndown": "5.0.5",
-        "@typescript-eslint/eslint-plugin": "8.44.1",
-        "@typescript-eslint/parser": "8.44.1",
-        "@typescript-eslint/utils": "8.44.1",
+        "@typescript-eslint/eslint-plugin": "8.45.0",
+        "@typescript-eslint/parser": "8.45.0",
+        "@typescript-eslint/utils": "8.45.0",
         "angular-eslint": "20.3.0",
-        "cross-env": "10.0.0",
+        "cross-env": "10.1.0",
         "eslint": "9.36.0",
         "eslint-plugin-jest": "29.0.1",
         "eslint-plugin-jest-extended": "3.0.1",
@@ -148,13 +148,13 @@
         "prettier": "3.6.2",
         "rimraf": "6.0.1",
         "sass": "1.93.2",
-        "stylelint": "16.24.0",
+        "stylelint": "16.25.0",
         "stylelint-config-html": "1.1.0",
         "stylelint-config-standard": "39.0.0",
         "stylelint-config-standard-scss": "16.0.0",
         "stylelint-scss": "6.12.1",
-        "typescript": "5.9.2",
-        "typescript-eslint": "8.44.1"
+        "typescript": "5.9.3",
+        "typescript-eslint": "8.45.0"
     },
     "engines": {
         "node": ">=24.7.0",

package.json

@@ -3,6 +3,7 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.ATLAS_ENABLED_PROPERTY_NAME;
 import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_ENABLED_PROPERTY_NAME;
 import static de.tum.cit.aet.artemis.core.config.Constants.HYPERION_ENABLED_PROPERTY_NAME;
+import static de.tum.cit.aet.artemis.core.config.Constants.NEBULA_ENABLED_PROPERTY_NAME;
 import static de.tum.cit.aet.artemis.core.config.Constants.PASSKEY_ENABLED_PROPERTY_NAME;
 
 import org.springframework.core.env.Environment;
@@ -84,6 +85,16 @@ public boolean isTutorialGroupEnabled(Environment environment) {
         return getPropertyOrExitArtemis(Constants.TUTORIAL_GROUP_ENABLED_PROPERTY_NAME, environment);
     }
 
+    /**
+     * Check if the Nebula module is enabled.
+     *
+     * @param environment the Spring environment
+     * @return true if the Nebula module is enabled, false otherwise
+     */
+    public boolean isNebulaEnabled(Environment environment) {
+        return getPropertyOrExitArtemis(NEBULA_ENABLED_PROPERTY_NAME, environment);
+    }
+
     private boolean getPropertyOrExitArtemis(String key, Environment environment) {
         Boolean value = environment.getProperty(key, Boolean.class);
         if (value == null) {

src/main/java/de/tum/cit/aet/artemis/core/config/ArtemisConfigHelper.java

@@ -420,6 +420,11 @@ public final class Constants {
      */
     public static final String MODULE_FEATURE_TUTORIALGROUP = "tutorialgroup";
 
+    /**
+     * The name of the module feature used for nebula functionality.
+     */
+    public static final String MODULE_FEATURE_NEBULA = "nebula";
+
     /**
      * The name of the property used to enable or disable Atlas functionality.
      */
@@ -455,6 +460,11 @@ public final class Constants {
      */
     public static final String PASSKEY_ENABLED_PROPERTY_NAME = "artemis.user-management.passkey.enabled";
 
+    /**
+     * The name of the property used to enable or disable nebula functionalities.
+     */
+    public static final String NEBULA_ENABLED_PROPERTY_NAME = "artemis.nebula.enabled";
+
     /**
      * The name of the property used to define the directories for file uploads.
      */

src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java

@@ -60,6 +60,9 @@ public void contribute(Info.Builder builder) {
         if (artemisConfigHelper.isPasskeyEnabled(environment)) {
             enabledArtemisFeatures.add(Constants.FEATURE_PASSKEY);
         }
+        if (artemisConfigHelper.isNebulaEnabled(environment)) {
+            enabledArtemisFeatures.add(Constants.MODULE_FEATURE_NEBULA);
+        }
         builder.withDetail(ACTIVE_MODULE_FEATURES, enabledArtemisFeatures);
     }
 }

src/main/java/de/tum/cit/aet/artemis/core/config/ModuleFeatureInfoContributor.java

@@ -11,6 +11,7 @@
 import jakarta.validation.constraints.NotNull;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
@@ -24,6 +25,7 @@
 
 import de.tum.cit.aet.artemis.athena.config.AthenaAuthorizationInterceptor;
 import de.tum.cit.aet.artemis.iris.config.PyrisAuthorizationInterceptor;
+import de.tum.cit.aet.artemis.nebula.config.NebulaEnabled;
 import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsAuthorizationInterceptor;
 
 /**
@@ -118,6 +120,12 @@ public RestTemplate shortTimeoutPyrisRestTemplate(PyrisAuthorizationInterceptor
         return initializeRestTemplateWithInterceptors(pyrisAuthorizationInterceptor, createShortTimeoutRestTemplate());
     }
 
+    @Bean
+    @Conditional(NebulaEnabled.class)
+    public RestTemplate nebulaRestTemplate() {
+        return createRestTemplate();
+    }
+
     /**
      * Creates a RestTemplate that can be used to communicate with Aeolus
      *

src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java

@@ -0,0 +1,25 @@
+package de.tum.cit.aet.artemis.nebula.config;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import de.tum.cit.aet.artemis.core.config.ArtemisConfigHelper;
+
+/**
+ * Condition to check if the Nebula module is enabled.
+ * Based on this condition, Spring components concerning nebula functionality can be enabled or disabled.
+ */
+public class NebulaEnabled implements Condition {
+
+    private final ArtemisConfigHelper artemisConfigHelper;
+
+    public NebulaEnabled() {
+        this.artemisConfigHelper = new ArtemisConfigHelper();
+    }
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return artemisConfigHelper.isNebulaEnabled(context.getEnvironment());
+    }
+}

src/main/java/de/tum/cit/aet/artemis/nebula/config/NebulaEnabled.java

@@ -0,0 +1,8 @@
+package de.tum.cit.aet.artemis.nebula.exception;
+
+public class NebulaConnectorException extends RuntimeException {
+
+    public NebulaConnectorException(String message) {
+        super(message);
+    }
+}