Skip to content

Commit

Permalink
Merge branch 'develop' into feature/communication/reference-faq-in-me…
Browse files Browse the repository at this point in the history
…ssages
  • Loading branch information
FelixTJDietrich authored Nov 29, 2024
2 parents 8ed8c14 + f81e35b commit d85f811
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 111 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.7.4.war
```

## Architecture
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

group = "de.tum.cit.aet.artemis"
version = "7.7.3"
version = "7.7.4"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down
39 changes: 2 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "artemis",
"version": "7.7.3",
"version": "7.7.4",
"description": "Interactive Learning with Individual Feedback",
"private": true,
"license": "MIT",
Expand Down Expand Up @@ -69,7 +69,6 @@
"papaparse": "5.4.1",
"pdf-lib": "1.17.1",
"pdfjs-dist": "4.8.69",
"posthog-js": "1.187.2",
"rxjs": "7.8.1",
"simple-statistics": "7.8.7",
"smoothscroll-polyfill": "0.4.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
import java.io.Serial;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;

// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis)
// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes.
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public record BuildAgentDTO(String name, String memberAddress, String displayName) implements Serializable {

@Serial
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ public void stopUnresponsiveContainer(String containerId) {
future.get(10, TimeUnit.SECONDS); // Wait for the stop command to complete with a timeout
}
catch (NotFoundException | NotModifiedException e) {
log.debug("Container with id {} is already stopped: {}", containerId, e.getMessage());
log.warn("Container with id {} is already stopped.", containerId, e);
}
catch (Exception e) {
log.warn("Failed to stop container with id {}. Attempting to kill container: {}", containerId, e.getMessage());
log.error("Failed to stop container with id {}. Attempting to kill container.", containerId, e);

// Attempt to kill the container if stop fails
try {
Expand All @@ -236,7 +236,7 @@ public void stopUnresponsiveContainer(String containerId) {
killFuture.get(5, TimeUnit.SECONDS); // Wait for the kill command to complete with a timeout
}
catch (Exception killException) {
log.warn("Failed to kill container with id {}: {}", containerId, killException.getMessage());
log.error("Failed to kill container with id {}.", containerId, killException);
}
}
finally {
Expand Down
20 changes: 0 additions & 20 deletions src/main/webapp/app/core/posthog/analytics.service.ts

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/webapp/app/shared/layouts/main/main.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
import { SentryErrorHandler } from 'app/core/sentry/sentry.error-handler';
import { ThemeService } from 'app/core/theme/theme.service';
import { DOCUMENT } from '@angular/common';
import { AnalyticsService } from 'app/core/posthog/analytics.service';
import { Subscription } from 'rxjs';
import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
import { CourseManagementService } from 'app/course/manage/course-management.service';
Expand Down Expand Up @@ -41,7 +40,6 @@ export class JhiMainComponent implements OnInit, OnDestroy {
private profileService: ProfileService,
private examParticipationService: ExamParticipationService,
private sentryErrorHandler: SentryErrorHandler,
private analyticsService: AnalyticsService,
private themeService: ThemeService,
@Inject(DOCUMENT)
private document: Document,
Expand All @@ -50,7 +48,6 @@ export class JhiMainComponent implements OnInit, OnDestroy {
private ltiService: LtiService,
) {
this.setupErrorHandling().then(undefined);
this.setupAnalytics().then(undefined);
}

private async setupErrorHandling() {
Expand All @@ -60,13 +57,6 @@ export class JhiMainComponent implements OnInit, OnDestroy {
});
}

private async setupAnalytics() {
this.profileService.getProfileInfo().subscribe((profileInfo) => {
// postHog is only activated if it was specified in the application.yml file
this.analyticsService.initAnalytics(profileInfo);
});
}

private getPageTitle(routeSnapshot: ActivatedRouteSnapshot): string {
const title: string = routeSnapshot.data['pageTitle'] ?? 'artemisApp';
if (routeSnapshot.firstChild) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ export class ProfileInfo {
public inDevelopment: boolean;
public openApiEnabled?: boolean;
public sentry?: { dsn: string };
public postHog?: {
host?: string;
token: string;
};
public features: ActiveFeatureToggles;
public guidedTourMapping?: GuidedTourMapping;
public buildPlanURLTemplate: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export class ProfileService {
profileInfo.ribbonEnv = profileInfo.ribbonEnv ?? '';

profileInfo.sentry = data.sentry;
profileInfo.postHog = data.postHog;
profileInfo.features = data.features;
profileInfo.buildPlanURLTemplate = data.buildPlanURLTemplate;
profileInfo.commitHashURLTemplate = data.commitHashURLTemplate;
Expand Down
32 changes: 0 additions & 32 deletions src/test/javascript/spec/core/post-hog-analytics.service.spec.ts

This file was deleted.

0 comments on commit d85f811

Please sign in to comment.