From 0019b90cee8838af8c21188f870dfe8149caf28b Mon Sep 17 00:00:00 2001 From: Simon Entholzer <33342534+SimonEntholzer@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:19:56 +0100 Subject: [PATCH] Remove explicit `standalone: true` (#357) * remove explicit standalone: true and fix failing server test --- .../app/layouts/ci-status-card/ci-status-card.component.ts | 1 - .../create-simulation-box/create-simulation-box.component.ts | 1 - src/main/webapp/app/layouts/log-box/log-box.component.ts | 1 - .../app/layouts/mode-explanation/mode-explanation.component.ts | 1 - .../webapp/app/layouts/server-badge/server-badge.component.ts | 1 - .../app/layouts/simulation-card/simulation-card.component.ts | 1 - .../simulation-schedule-dialog.component.ts | 1 - .../webapp/app/layouts/status-icon/status-icon.component.ts | 1 - .../simulations-overview/simulations-overview.component.ts | 1 - .../de/tum/cit/aet/service/SimulationExecutionServiceIT.java | 3 +-- 10 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/webapp/app/layouts/ci-status-card/ci-status-card.component.ts b/src/main/webapp/app/layouts/ci-status-card/ci-status-card.component.ts index 8092f1c..993edd1 100644 --- a/src/main/webapp/app/layouts/ci-status-card/ci-status-card.component.ts +++ b/src/main/webapp/app/layouts/ci-status-card/ci-status-card.component.ts @@ -7,7 +7,6 @@ import { DecimalPipe } from '@angular/common'; imports: [DecimalPipe], templateUrl: './ci-status-card.component.html', styleUrl: './ci-status-card.component.scss', - standalone: true, }) export class CiStatusCardComponent { ciStatus = input.required(); diff --git a/src/main/webapp/app/layouts/create-simulation-box/create-simulation-box.component.ts b/src/main/webapp/app/layouts/create-simulation-box/create-simulation-box.component.ts index e50de3f..a5fc372 100644 --- a/src/main/webapp/app/layouts/create-simulation-box/create-simulation-box.component.ts +++ b/src/main/webapp/app/layouts/create-simulation-box/create-simulation-box.component.ts @@ -14,7 +14,6 @@ import { ModeExplanationComponent } from '../mode-explanation/mode-explanation.c templateUrl: './create-simulation-box.component.html', styleUrls: ['./create-simulation-box.component.scss'], imports: [FormsModule, RouterLink, FaIconComponent, ModeExplanationComponent], - standalone: true, }) export class CreateSimulationBoxComponent implements OnInit { faEye = faEye; diff --git a/src/main/webapp/app/layouts/log-box/log-box.component.ts b/src/main/webapp/app/layouts/log-box/log-box.component.ts index 15f8795..963a4cd 100644 --- a/src/main/webapp/app/layouts/log-box/log-box.component.ts +++ b/src/main/webapp/app/layouts/log-box/log-box.component.ts @@ -7,7 +7,6 @@ import { DatePipe, NgClass } from '@angular/common'; templateUrl: './log-box.component.html', styleUrls: ['./log-box.component.scss'], imports: [NgClass, DatePipe], - standalone: true, }) export class LogBoxComponent { logMessages = input(); diff --git a/src/main/webapp/app/layouts/mode-explanation/mode-explanation.component.ts b/src/main/webapp/app/layouts/mode-explanation/mode-explanation.component.ts index 6e898cf..ef3c1c6 100644 --- a/src/main/webapp/app/layouts/mode-explanation/mode-explanation.component.ts +++ b/src/main/webapp/app/layouts/mode-explanation/mode-explanation.component.ts @@ -7,7 +7,6 @@ import { NgbAlert } from '@ng-bootstrap/ng-bootstrap'; templateUrl: './mode-explanation.component.html', styleUrls: ['./mode-explanation.component.scss'], imports: [NgbAlert], - standalone: true, }) export class ModeExplanationComponent { readonly mode = input(); diff --git a/src/main/webapp/app/layouts/server-badge/server-badge.component.ts b/src/main/webapp/app/layouts/server-badge/server-badge.component.ts index a232973..83975a8 100644 --- a/src/main/webapp/app/layouts/server-badge/server-badge.component.ts +++ b/src/main/webapp/app/layouts/server-badge/server-badge.component.ts @@ -7,7 +7,6 @@ import { NgClass } from '@angular/common'; templateUrl: './server-badge.component.html', styleUrls: ['./server-badge.component.scss'], imports: [NgClass], - standalone: true, }) export class ServerBadgeComponent { readonly server = input(); diff --git a/src/main/webapp/app/layouts/simulation-card/simulation-card.component.ts b/src/main/webapp/app/layouts/simulation-card/simulation-card.component.ts index 708fe75..5e53c72 100644 --- a/src/main/webapp/app/layouts/simulation-card/simulation-card.component.ts +++ b/src/main/webapp/app/layouts/simulation-card/simulation-card.component.ts @@ -18,7 +18,6 @@ import { FormsModule } from '@angular/forms'; templateUrl: './simulation-card.component.html', styleUrls: ['./simulation-card.component.scss'], imports: [FaIconComponent, NgbTooltip, NgClass, ServerBadgeComponent, StatusIconComponent, DatePipe, FormsModule], - standalone: true, }) export class SimulationCardComponent implements OnInit { faTrashCan = faTrashCan; diff --git a/src/main/webapp/app/layouts/simulation-schedule-dialog/simulation-schedule-dialog.component.ts b/src/main/webapp/app/layouts/simulation-schedule-dialog/simulation-schedule-dialog.component.ts index 5768a7e..03e6956 100644 --- a/src/main/webapp/app/layouts/simulation-schedule-dialog/simulation-schedule-dialog.component.ts +++ b/src/main/webapp/app/layouts/simulation-schedule-dialog/simulation-schedule-dialog.component.ts @@ -31,7 +31,6 @@ import SharedModule from '../../shared/shared.module'; ], templateUrl: './simulation-schedule-dialog.component.html', styleUrl: './simulation-schedule-dialog.component.scss', - standalone: true, }) export class SimulationScheduleDialogComponent implements OnInit { emailRegex = diff --git a/src/main/webapp/app/layouts/status-icon/status-icon.component.ts b/src/main/webapp/app/layouts/status-icon/status-icon.component.ts index f68a4a6..c540c8a 100644 --- a/src/main/webapp/app/layouts/status-icon/status-icon.component.ts +++ b/src/main/webapp/app/layouts/status-icon/status-icon.component.ts @@ -8,7 +8,6 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; templateUrl: './status-icon.component.html', styleUrls: ['./status-icon.component.scss'], imports: [FaIconComponent], - standalone: true, }) export class StatusIconComponent { faCircleCheck = faCircleCheck; diff --git a/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.ts b/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.ts index 53b0d02..2501ef9 100644 --- a/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.ts +++ b/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.ts @@ -36,7 +36,6 @@ export function sortSimulations(simulations: Simulation[]): Simulation[] { ResultBoxComponent, DatePipe, ], - standalone: true, }) export default class SimulationsOverviewComponent implements OnInit { faSpinner = faSpinner; diff --git a/src/test/java/de/tum/cit/aet/service/SimulationExecutionServiceIT.java b/src/test/java/de/tum/cit/aet/service/SimulationExecutionServiceIT.java index 3c97ae2..d80b67c 100644 --- a/src/test/java/de/tum/cit/aet/service/SimulationExecutionServiceIT.java +++ b/src/test/java/de/tum/cit/aet/service/SimulationExecutionServiceIT.java @@ -210,8 +210,7 @@ public void testCreateCourseAndExam_cleanupEnabled_success() { ); verify(simulatedArtemisAdmin, times(1)).registerStudentsForExam(1, 1); verify(simulatedArtemisAdmin, times(1)).prepareExam(1, 1); - verify(simulatedArtemisAdmin, times(1)).cancelAllQueuedBuildJobs(); - verify(simulatedArtemisAdmin, times(1)).cancelAllRunningBuildJobs(); + // To give Artemis time to cancel all build jobs we extend the timeout beyond 5 seconds verify(simulatedArtemisAdmin, timeout(13000).times(1)).deleteCourse(1); verify(simulatedArtemisAdmin, timeout(1000).times(0)).deleteExam(anyLong(), anyLong());