chore: Reset to develop

ls1intum · Sep 5, 2024 · c195839 · c195839
1 parent 1ac30d7
commit c195839
Show file tree

Hide file tree

Showing 53 changed files with 2,217 additions and 577 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,18 +13,18 @@
         "node_modules"
     ],
     "dependencies": {
-        "@angular/animations": "18.2.3",
-        "@angular/cdk": "18.2.3",
-        "@angular/common": "18.2.3",
-        "@angular/compiler": "18.2.3",
-        "@angular/core": "18.2.3",
-        "@angular/forms": "18.2.3",
-        "@angular/localize": "18.2.3",
-        "@angular/material": "18.2.3",
-        "@angular/platform-browser": "18.2.3",
-        "@angular/platform-browser-dynamic": "18.2.3",
-        "@angular/router": "18.2.3",
-        "@angular/service-worker": "18.2.3",
+        "@angular/animations": "18.2.2",
+        "@angular/cdk": "18.2.2",
+        "@angular/common": "18.2.2",
+        "@angular/compiler": "18.2.2",
+        "@angular/core": "18.2.2",
+        "@angular/forms": "18.2.2",
+        "@angular/localize": "18.2.2",
+        "@angular/material": "18.2.2",
+        "@angular/platform-browser": "18.2.2",
+        "@angular/platform-browser-dynamic": "18.2.2",
+        "@angular/router": "18.2.2",
+        "@angular/service-worker": "18.2.2",
         "@ctrl/ngx-emoji-mart": "9.2.0",
         "@danielmoncada/angular-datetime-picker": "18.1.0",
         "@fingerprintjs/fingerprintjs": "4.4.3",
@@ -37,7 +37,7 @@
         "@ng-bootstrap/ng-bootstrap": "17.0.1",
         "@ngx-translate/core": "15.0.0",
         "@ngx-translate/http-loader": "8.0.0",
-        "@sentry/angular": "8.28.0",
+        "@sentry/angular": "8.27.0",
         "@swimlane/ngx-charts": "20.5.0",
         "@swimlane/ngx-graph": "8.4.0",
         "@vscode/codicons": "0.0.36",
@@ -46,9 +46,9 @@
         "core-js": "3.38.1",
         "crypto-js": "4.2.0",
         "dayjs": "1.11.13",
-        "diff-match-patch-typescript": "1.1.0",
+        "diff-match-patch-typescript": "1.0.8",
         "dompurify": "3.1.6",
-        "export-to-csv": "1.4.0",
+        "export-to-csv": "1.3.0",
         "fast-json-patch": "3.1.1",
         "franc-min": "6.2.0",
         "html-diff-ts": "1.4.2",
@@ -62,8 +62,8 @@
         "ngx-infinite-scroll": "18.0.0",
         "ngx-webstorage": "18.0.0",
         "papaparse": "5.4.1",
-        "pdfjs-dist": "4.6.82",
-        "posthog-js": "1.160.3",
+        "pdfjs-dist": "^4.5.136",
+        "posthog-js": "1.160.0",
         "rxjs": "7.8.1",
         "showdown": "2.1.0",
         "showdown-highlight": "3.1.0",
@@ -97,12 +97,11 @@
             "eslint": "^9.9.0"
         },
         "eslint-plugin-jest": {
-            "@typescript-eslint/eslint-plugin": "^8.4.0"
+            "@typescript-eslint/eslint-plugin": "^8.1.0"
         },
         "jsdom": "24.1.1",
         "katex": "0.16.11",
         "postcss": "8.4.41",
-        "rimraf": "6.0.1",
         "semver": "7.6.3",
         "showdown-katex": {
             "showdown": "2.1.0"
@@ -115,33 +114,33 @@
     },
     "devDependencies": {
         "@angular-builders/jest": "18.0.0",
-        "@angular-devkit/build-angular": "18.2.3",
+        "@angular-devkit/build-angular": "18.2.2",
         "@angular-eslint/builder": "18.3.0",
         "@angular-eslint/eslint-plugin": "18.3.0",
         "@angular-eslint/eslint-plugin-template": "18.3.0",
         "@angular-eslint/schematics": "18.3.0",
         "@angular-eslint/template-parser": "18.3.0",
-        "@angular/cli": "18.2.3",
-        "@angular/compiler-cli": "18.2.3",
-        "@angular/language-service": "18.2.3",
-        "@sentry/types": "8.28.0",
+        "@angular/cli": "18.2.2",
+        "@angular/compiler-cli": "18.2.2",
+        "@angular/language-service": "18.2.2",
+        "@sentry/types": "8.27.0",
         "@types/crypto-js": "4.2.2",
         "@types/d3-shape": "3.1.6",
         "@types/dompurify": "3.0.5",
         "@types/jest": "29.5.12",
         "@types/lodash-es": "4.17.12",
-        "@types/node": "22.5.4",
+        "@types/node": "22.5.1",
         "@types/papaparse": "5.3.14",
         "@types/showdown": "2.0.6",
         "@types/smoothscroll-polyfill": "0.3.4",
         "@types/sockjs-client": "1.5.4",
         "@types/uuid": "10.0.0",
-        "@typescript-eslint/eslint-plugin": "8.4.0",
-        "@typescript-eslint/parser": "8.4.0",
+        "@typescript-eslint/eslint-plugin": "8.3.0",
+        "@typescript-eslint/parser": "8.3.0",
         "eslint": "9.9.1",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-deprecation": "3.0.0",
-        "eslint-plugin-jest": "28.8.3",
+        "eslint-plugin-jest": "28.8.1",
         "eslint-plugin-jest-extended": "2.4.0",
         "eslint-plugin-prettier": "5.2.1",
         "folder-hash": "4.0.4",
@@ -153,11 +152,10 @@
         "jest-fail-on-console": "3.3.0",
         "jest-junit": "16.0.0",
         "jest-preset-angular": "14.2.2",
-        "lint-staged": "15.2.10",
+        "lint-staged": "15.2.9",
         "ng-mocks": "14.13.1",
         "prettier": "3.3.3",
-        "rimraf": "6.0.1",
-        "sass": "1.78.0",
+        "sass": "1.77.8",
         "ts-jest": "29.2.5",
         "typescript": "5.5.4",
         "weak-napi": "2.0.2"

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java
@@ -32,6 +32,10 @@ public class IrisCourseSettings extends IrisSettings {
     @JoinColumn(name = "iris_lecture_ingestion_settings_id")
     private IrisLectureIngestionSubSettings irisLectureIngestionSettings;
 
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false)
+    @JoinColumn(name = "iris_proactivity_settings_id")
+    private IrisProactivitySubSettings irisProactivitySettings;
+
     @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     @JoinColumn(name = "iris_hestia_settings_id")
     private IrisHestiaSubSettings irisHestiaSettings;
@@ -63,6 +67,16 @@ public void setIrisLectureIngestionSettings(IrisLectureIngestionSubSettings iris
         this.irisLectureIngestionSettings = irisLectureIngestionSettings;
     }
 
+    @Override
+    public IrisProactivitySubSettings getIrisProactivitySettings() {
+        return irisProactivitySettings;
+    }
+
+    @Override
+    public void setIrisProactivitySettings(IrisProactivitySubSettings irisProactivitySettings) {
+        this.irisProactivitySettings = irisProactivitySettings;
+    }
+
     @Override
     public IrisChatSubSettings getIrisChatSettings() {
         return irisChatSettings;

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java
@@ -50,6 +50,15 @@ public IrisLectureIngestionSubSettings getIrisLectureIngestionSettings() {
     public void setIrisLectureIngestionSettings(IrisLectureIngestionSubSettings irisLectureIngestionSettings) {
     }
 
+    @Override
+    public IrisProactivitySubSettings getIrisProactivitySettings() {
+        return null;
+    }
+
+    @Override
+    public void setIrisProactivitySettings(IrisProactivitySubSettings irisProactivitySettings) {
+    }
+
     @Override
     public IrisChatSubSettings getIrisChatSettings() {
         return irisChatSettings;

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisGlobalSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisGlobalSettings.java
@@ -34,6 +34,9 @@ public class IrisGlobalSettings extends IrisSettings {
     @Column(name = "enable_auto_update_lecture_ingestion")
     private boolean enableAutoUpdateLectureIngestion;
 
+    @Column(name = "enable_auto_update_proactivity")
+    private boolean enableAutoUpdateProactivity;
+
     @Column(name = "enable_auto_update_competency_generation")
     private boolean enableAutoUpdateCompetencyGeneration;
 
@@ -45,6 +48,10 @@ public class IrisGlobalSettings extends IrisSettings {
     @JoinColumn(name = "iris_lecture_ingestion_settings_id")
     private IrisLectureIngestionSubSettings irisLectureIngestionSettings;
 
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false)
+    @JoinColumn(name = "iris_proactivity_settings_id")
+    private IrisProactivitySubSettings irisProactivitySettings;
+
     @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false)
     @JoinColumn(name = "iris_hestia_settings_id")
     private IrisHestiaSubSettings irisHestiaSettings;
@@ -62,7 +69,9 @@ public boolean isValid() {
         var competencyGenerationSettingsValid = !Hibernate.isInitialized(irisCompetencyGenerationSettings) || irisCompetencyGenerationSettings == null
                 || (irisCompetencyGenerationSettings.getTemplate() != null && irisCompetencyGenerationSettings.getTemplate().getContent() != null
                         && !irisCompetencyGenerationSettings.getTemplate().getContent().isEmpty());
-        return chatSettingsValid && hestiaSettingsValid && competencyGenerationSettingsValid;
+        var proactivitySettingsValid = !Hibernate.isInitialized(irisProactivitySettings) || irisProactivitySettings == null
+                || (irisProactivitySettings.getEventSettings() != null && !irisProactivitySettings.getEventSettings().isEmpty());
+        return chatSettingsValid && hestiaSettingsValid && competencyGenerationSettingsValid && proactivitySettingsValid;
     }
 
     public int getCurrentVersion() {
@@ -105,6 +114,22 @@ public void setEnableAutoUpdateCompetencyGeneration(boolean enableAutoUpdateComp
         this.enableAutoUpdateCompetencyGeneration = enableAutoUpdateCompetencyGeneration;
     }
 
+    public boolean isEnableAutoUpdateProactivity() {
+        return enableAutoUpdateProactivity;
+    }
+
+    public void setEnableAutoUpdateProactivity(boolean enableAutoUpdateProactivity) {
+        this.enableAutoUpdateProactivity = enableAutoUpdateProactivity;
+    }
+
+    public IrisProactivitySubSettings getIrisProactivitySettings() {
+        return irisProactivitySettings;
+    }
+
+    public void setIrisProactivitySettings(IrisProactivitySubSettings irisProactivitySettings) {
+        this.irisProactivitySettings = irisProactivitySettings;
+    }
+
     @Override
     public IrisLectureIngestionSubSettings getIrisLectureIngestionSettings() {
         return irisLectureIngestionSettings;

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisProactivitySubSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisProactivitySubSettings.java
@@ -0,0 +1,35 @@
+package de.tum.in.www1.artemis.domain.iris.settings;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.iris.settings.event.IrisEventSettings;
+
+/**
+ * Represents the specific ingestion sub-settings of lectures for Iris.
+ * This class extends {@link IrisSubSettings} to provide settings required for lecture data ingestion.
+ */
+@Entity
+@DiscriminatorValue("PROACTIVITY")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisProactivitySubSettings extends IrisSubSettings {
+
+    @OneToMany(mappedBy = "proactivitySubSettings", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private Set<IrisEventSettings> eventSettings = new HashSet<>();
+
+    public Set<IrisEventSettings> getEventSettings() {
+        return eventSettings;
+    }
+
+    public void setEventSettings(Set<IrisEventSettings> proactivityStatuses) {
+        this.eventSettings = proactivityStatuses;
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettings.java
@@ -49,6 +49,10 @@ public abstract class IrisSettings extends DomainObject {
 
     public abstract void setIrisLectureIngestionSettings(IrisLectureIngestionSubSettings irisLectureIngestionSettings);
 
+    public abstract IrisProactivitySubSettings getIrisProactivitySettings();
+
+    public abstract void setIrisProactivitySettings(IrisProactivitySubSettings irisProactivitySettings);
+
     public abstract IrisHestiaSubSettings getIrisHestiaSettings();
 
     public abstract void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings);

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java
@@ -42,7 +42,8 @@
     @JsonSubTypes.Type(value = IrisChatSubSettings.class, name = "chat"),
     @JsonSubTypes.Type(value = IrisLectureIngestionSubSettings.class, name = "lecture-ingestion"),
     @JsonSubTypes.Type(value = IrisHestiaSubSettings.class, name = "hestia"),
-    @JsonSubTypes.Type(value = IrisCompetencyGenerationSubSettings.class, name = "competency-generation")
+    @JsonSubTypes.Type(value = IrisCompetencyGenerationSubSettings.class, name = "competency-generation"),
+    @JsonSubTypes.Type(value = IrisProactivitySubSettings.class, name = "proactivity")
 })
 // @formatter:on
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettingsType.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettingsType.java
@@ -1,5 +1,5 @@
 package de.tum.in.www1.artemis.domain.iris.settings;
 
 public enum IrisSubSettingsType {
-    CHAT, HESTIA, COMPETENCY_GENERATION, LECTURE_INGESTION
+    CHAT, HESTIA, COMPETENCY_GENERATION, LECTURE_INGESTION, PROACTIVITY
 }
diff --git a/.../java/de/tum/in/www1/artemis/domain/iris/settings/event/IrisBuildFailedEventSettings.java b/.../java/de/tum/in/www1/artemis/domain/iris/settings/event/IrisBuildFailedEventSettings.java
@@ -0,0 +1,25 @@
+package de.tum.in.www1.artemis.domain.iris.settings.event;
+
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * The settings for the Iris event of type BUILD_FAILED.
+ */
+@Entity
+@DiscriminatorValue("BUILD_FAILED")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisBuildFailedEventSettings extends IrisEventSettings {
+
+    @Override
+    public IrisEventTarget getDefaultLevel() {
+        return IrisEventTarget.EXERCISE;
+    }
+
+    @Override
+    public String getDefaultPipelineVariant() {
+        return "build_failed";
+    }
+}