Merge branch 'dev' into CSCEXAM-1998

CSCfi · Jan 16, 2025 · 65b3b7c · 65b3b7c
2 parents 51994d1 + 6159be2
commit 65b3b7c
Show file tree

Hide file tree

Showing 36 changed files with 249 additions and 212 deletions.
diff --git a/app/controllers/user/SessionController.java b/app/controllers/user/SessionController.java
@@ -76,7 +76,9 @@ public class SessionController extends BaseController {
         "x-exam-wrong-room",
         "wrongRoomData",
         "x-exam-wrong-agent-config",
-        "wrongAgent"
+        "wrongAgent",
+        "x-exam-aquarium-login",
+        "aquariumLogin"
     );
 
     @Inject

diff --git a/app/repository/EnrolmentRepository.java b/app/repository/EnrolmentRepository.java
@@ -288,6 +288,11 @@ private void handleUpcomingEnrolment(
             if (
                 enrolment.getExam() != null && enrolment.getExam().getImplementation() == Exam.Implementation.AQUARIUM
             ) {
+                // If user is on a correct aquarium machine then always set a header
+                headers.put(
+                    "x-exam-aquarium-login",
+                    String.format("%s:::%d", getExamHash(enrolment), enrolment.getId())
+                );
                 // Aquarium exam, don't set headers unless it starts in 5 minutes
                 DateTime threshold = DateTime.now().plusMinutes(5);
                 DateTime start = dateTimeHandler.normalize(

diff --git a/app/system/SystemFilter.scala b/app/system/SystemFilter.scala
@@ -12,48 +12,43 @@ import play.api.mvc.{Filter, RequestHeader, Result}
 import javax.inject.Inject
 import scala.concurrent.{ExecutionContext, Future}
 
-object ResultImplicits {
-  implicit class EnhancedResult(result: Result) {
-    def discardingHeaders(headers: String*): Result =
-      result.copy(header = result.header.copy(headers = result.header.headers -- headers))
-  }
-}
-
-class SystemFilter @Inject() (implicit val mat: Materializer, ec: ExecutionContext) extends Filter {
+class SystemFilter @Inject() (implicit val mat: Materializer, ec: ExecutionContext) extends Filter:
 
   val Headers: Seq[(String, String)] = Seq(
     ("x-exam-start-exam", "ongoingExamHash"),
     ("x-exam-upcoming-exam", "upcomingExamHash"),
     ("x-exam-wrong-machine", "wrongMachineData"),
     ("x-exam-unknown-machine", "unknownMachineData"),
     ("x-exam-wrong-room", "wrongRoomData"),
-    ("x-exam-wrong-agent-config", "wrongAgent")
+    ("x-exam-wrong-agent-config", "wrongAgent"),
+    ("x-exam-aquarium-login", "aquariumLogin")
   )
 
-  import ResultImplicits._
+  extension (result: Result)
+    private def discardingHeaders(headers: String*): Result =
+      result.copy(header = result.header.copy(headers = result.header.headers -- headers))
 
-  private def processResult(src: Result)(implicit request: RequestHeader): Result = {
-    val session = src.session match {
+  private def processResult(src: Result)(implicit request: RequestHeader): Result =
+    val session = src.session match
       case s if s.isEmpty =>
         request.session match {
           case rs if rs.isEmpty => None
           case rs               => Some(rs)
         }
       case s => Some(s)
-    }
     val result = src.withHeaders(
       ("Cache-Control", "no-cache;no-store"),
       ("Pragma", "no-cache"),
       ("Expires", "0")
     )
-    session match {
+    session match
       case None => result.withNewSession
       case Some(s) =>
         val (remaining, discarded) = Headers.partition(h => s.get(h._2).isDefined)
         val response = result
           .withHeaders(remaining.map(h => (h._1, s.get(h._2).get))*)
           .discardingHeaders(discarded.map(_._1)*)
-        request.path match {
+        request.path match
           case path if path == "/app/session" && request.method == "GET" =>
             s.get("upcomingExamHash") match {
               case Some(_) => // Don't let session expire when awaiting exam to start
@@ -63,17 +58,11 @@ class SystemFilter @Inject() (implicit val mat: Materializer, ec: ExecutionConte
           case path if path.contains("logout") => response.withSession(s)
           case _ =>
             response.withSession(s + ("since" -> ISODateTimeFormat.dateTime.print(DateTime.now)))
-        }
-    }
-  }
 
   override def apply(next: RequestHeader => Future[Result])(rh: RequestHeader): Future[Result] =
-    rh.path match {
+    rh.path match
       case "/app/logout" => next.apply(rh)
       // Disable caching for index page so that CSRF cookie can be injected without worries
       case p if p.startsWith("/app") | p.startsWith("/integration") =>
         next.apply(rh).map(processResult(_)(rh))
       case _ => next.apply(rh).map(_.withHeaders(("Cache-Control", "no-cache")))
-    }
-
-}
diff --git a/ui/src/app/administrative/reports/categories/answers-report.component.ts b/ui/src/app/administrative/reports/categories/answers-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
@@ -39,7 +38,7 @@ import { FileService } from 'src/app/shared/file/file.service';
     `,
     selector: 'xm-answers-report',
     standalone: true,
-    imports: [DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DatePickerComponent, TranslateModule],
 })
 export class AnswersReportComponent {
     startDate: Date | null = null;

diff --git a/ui/src/app/administrative/reports/categories/enrolments-report.component.ts b/ui/src/app/administrative/reports/categories/enrolments-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component, Input } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
 import { FileService } from 'src/app/shared/file/file.service';
@@ -36,7 +35,7 @@ import { Option } from 'src/app/shared/select/select.model';
     `,
     selector: 'xm-enrolments-report',
     standalone: true,
-    imports: [DropdownSelectComponent, NgbPopover, TranslateModule],
+    imports: [DropdownSelectComponent, TranslateModule],
 })
 export class EnrolmentsReportComponent {
     @Input() examNames: Option<string, number>[] = [];

diff --git a/ui/src/app/administrative/reports/categories/exams-report.component.ts b/ui/src/app/administrative/reports/categories/exams-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component, Input } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
 import { FileService } from 'src/app/shared/file/file.service';
@@ -39,7 +38,7 @@ import { Option } from 'src/app/shared/select/select.model';
     `,
     selector: 'xm-exams-report',
     standalone: true,
-    imports: [DropdownSelectComponent, NgbPopover, TranslateModule],
+    imports: [DropdownSelectComponent, TranslateModule],
 })
 export class ExamsReportComponent {
     @Input() examNames: Option<string, number>[] = [];

diff --git a/ui/src/app/administrative/reports/categories/records-report.component.ts b/ui/src/app/administrative/reports/categories/records-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
 import { FileService } from 'src/app/shared/file/file.service';
@@ -38,7 +37,7 @@ import { FileService } from 'src/app/shared/file/file.service';
     `,
     selector: 'xm-records-report',
     standalone: true,
-    imports: [DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DatePickerComponent, TranslateModule],
 })
 export class RecordsReportComponent {
     startDate: Date | null = null;

diff --git a/ui/src/app/administrative/reports/categories/reviews-report.component.ts b/ui/src/app/administrative/reports/categories/reviews-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
@@ -38,7 +37,7 @@ import { FileService } from 'src/app/shared/file/file.service';
     `,
     selector: 'xm-reviews-report',
     standalone: true,
-    imports: [DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DatePickerComponent, TranslateModule],
 })
 export class ReviewsReportComponent {
     startDate: Date | null = null;

diff --git a/ui/src/app/administrative/reports/categories/rooms-report.component.ts b/ui/src/app/administrative/reports/categories/rooms-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component, Input } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
@@ -53,7 +52,7 @@ import { Option } from 'src/app/shared/select/select.model';
     `,
     selector: 'xm-rooms-report',
     standalone: true,
-    imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DropdownSelectComponent, DatePickerComponent, TranslateModule],
 })
 export class RoomsReportComponent {
     @Input() rooms: Option<ExamRoom, number>[] = [];

diff --git a/ui/src/app/administrative/reports/categories/students-report.component.ts b/ui/src/app/administrative/reports/categories/students-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component, Input } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
@@ -51,7 +50,7 @@ import { Option } from 'src/app/shared/select/select.model';
     `,
     selector: 'xm-students-report',
     standalone: true,
-    imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DropdownSelectComponent, DatePickerComponent, TranslateModule],
 })
 export class StudentsReportComponent {
     @Input() students: Option<User, number>[] = [];

diff --git a/ui/src/app/administrative/reports/categories/teachers-report.component.ts b/ui/src/app/administrative/reports/categories/teachers-report.component.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import { Component, Input } from '@angular/core';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
@@ -51,7 +50,7 @@ import { Option } from 'src/app/shared/select/select.model';
     `,
     selector: 'xm-teachers-report',
     standalone: true,
-    imports: [DropdownSelectComponent, DatePickerComponent, NgbPopover, TranslateModule],
+    imports: [DropdownSelectComponent, DatePickerComponent, TranslateModule],
 })
 export class TeachersReportComponent {
     @Input() teachers: Option<User, number>[] = [];

diff --git a/ui/src/app/app.routes.ts b/ui/src/app/app.routes.ts
@@ -12,13 +12,7 @@ import { LogoutComponent } from './session/logout/logout.component';
 const buildTitle = (key: string, extraPart = ''): Observable<string> => {
     const tx = inject(TranslateService);
     const extra = extraPart ? ` ${extraPart}` : '';
-    return tx.get(key).pipe(
-        map(
-            () =>
-                `${tx.instant(key)}${extra}
-     - EXAM`,
-        ),
-    );
+    return tx.get(key).pipe(map(() => `${tx.instant(key)}${extra}- EXAM`));
 };
 
 export const APP_ROUTES: Route[] = [
@@ -58,6 +52,14 @@ export const APP_ROUTES: Route[] = [
             import('./enrolment/waiting-room/waiting-room.component').then((mod) => mod.WaitingRoomComponent),
         title: () => buildTitle('i18n_waiting_room_title'),
     },
+    {
+        path: 'early/:id/:hash',
+        loadComponent: () =>
+            import('./enrolment/waiting-room/waiting-room-early.component').then(
+                (mod) => mod.WaitingRoomEarlyComponent,
+            ),
+        title: () => buildTitle('i18n_waiting_room_title'),
+    },
     {
         path: 'wrongroom/:eid/:mid',
         loadComponent: () =>

diff --git a/ui/src/app/calendar/calendar.component.ts b/ui/src/app/calendar/calendar.component.ts
@@ -16,9 +16,7 @@ import { PageContentComponent } from 'src/app/shared/components/page-content.com
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
 import { DateTimeService } from 'src/app/shared/date/date.service';
 import { ConfirmationDialogService } from 'src/app/shared/dialogs/confirmation-dialog.service';
-import { HistoryBackComponent } from 'src/app/shared/history/history-back.component';
 import { CourseCodeComponent } from 'src/app/shared/miscellaneous/course-code.component';
-import { AutoFocusDirective } from 'src/app/shared/select/auto-focus.directive';
 import { ExamInfo, Organisation } from './calendar.model';
 import { CalendarService } from './calendar.service';
 import { CalendarExamInfoComponent } from './helpers/exam-info.component';
@@ -32,8 +30,6 @@ import { SlotPickerComponent } from './helpers/slot-picker.component';
     styleUrls: ['./calendar.component.scss'],
     standalone: true,
     imports: [
-        HistoryBackComponent,
-        AutoFocusDirective,
         CalendarExamInfoComponent,
         OptionalSectionsComponent,
         OrganisationPickerComponent,

diff --git a/ui/src/app/calendar/helpers/selected-room.component.ts b/ui/src/app/calendar/helpers/selected-room.component.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: EUPL-1.2
 
-import { DatePipe, NgClass, NgIf, UpperCasePipe } from '@angular/common';
+import { DatePipe, NgClass, UpperCasePipe } from '@angular/common';
 import { Component, Input, OnChanges, OnInit, signal } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -71,7 +71,9 @@ import { OrderByPipe } from 'src/app/shared/sorting/order-by.pipe';
                             {{ period.startsAt | date: 'dd.MM.yyyy HH:mm' }} -
                             {{ period.endsAt | date: 'dd.MM.yyyy HH:mm' }}
                             {{ period.description }}
-                            <span *ngIf="period.remote" class="text-danger">(remote)</span>
+                            @if (period.remote) {
+                                <span class="text-danger">(remote)</span>
+                            }
                         </div>
                     }
                 </div>
@@ -96,7 +98,7 @@ import { OrderByPipe } from 'src/app/shared/sorting/order-by.pipe';
     `,
     styleUrls: ['../calendar.component.scss'],
     standalone: true,
-    imports: [NgClass, NgIf, NgbPopover, UpperCasePipe, DatePipe, TranslateModule, OrderByPipe],
+    imports: [NgClass, NgbPopover, UpperCasePipe, DatePipe, TranslateModule, OrderByPipe],
 })
 export class SelectedRoomComponent implements OnInit, OnChanges {
     @Input() room!: ExamRoom;

diff --git a/ui/src/app/calendar/helpers/slot-picker.component.ts b/ui/src/app/calendar/helpers/slot-picker.component.ts
@@ -8,13 +8,7 @@ import type { SimpleChanges } from '@angular/core';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { EventApi, EventInput } from '@fullcalendar/core';
-import {
-    NgbCollapse,
-    NgbDropdown,
-    NgbDropdownItem,
-    NgbDropdownMenu,
-    NgbDropdownToggle,
-} from '@ng-bootstrap/ng-bootstrap';
+import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
 import { ToastrService } from 'ngx-toastr';
@@ -39,7 +33,6 @@ type AvailableSlot = Slot & { availableMachines: number };
     standalone: true,
     imports: [
         NgClass,
-        NgbCollapse,
         NgbDropdown,
         NgbDropdownToggle,
         NgbDropdownMenu,

diff --git a/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts b/ui/src/app/dashboard/staff/teacher/categories/exam-list-category.component.ts
@@ -7,7 +7,7 @@ import type { OnInit } from '@angular/core';
 import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Router, RouterLink } from '@angular/router';
-import { NgbModal, NgbPopover } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
 import { Subject, from } from 'rxjs';
@@ -37,7 +37,6 @@ import { TeacherListComponent } from 'src/app/shared/user/teacher-list.component
         RouterLink,
         CourseCodeComponent,
         TeacherListComponent,
-        NgbPopover,
         DatePipe,
         TranslateModule,
         OrderByPipe,

diff --git a/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts b/ui/src/app/enrolment/exams/exam-enrolment-details.component.ts
@@ -11,7 +11,6 @@ import { EnrolmentService } from 'src/app/enrolment/enrolment.service';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
 import { DateTimeService } from 'src/app/shared/date/date.service';
-import { HistoryBackComponent } from 'src/app/shared/history/history-back.component';
 import { MathJaxDirective } from 'src/app/shared/math/math-jax.directive';
 import { CommonExamService } from 'src/app/shared/miscellaneous/common-exam.service';
 import { CourseCodeComponent } from 'src/app/shared/miscellaneous/course-code.component';
@@ -22,7 +21,6 @@ import { TeacherListComponent } from 'src/app/shared/user/teacher-list.component
     templateUrl: './exam-enrolment-details.component.html',
     standalone: true,
     imports: [
-        HistoryBackComponent,
         CourseCodeComponent,
         TeacherListComponent,
         MathJaxDirective,

diff --git a/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts b/ui/src/app/enrolment/finished/collaborative-exam-participations.component.ts
@@ -14,7 +14,6 @@ import { EnrolmentService } from 'src/app/enrolment/enrolment.service';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
 import { PaginatorComponent } from 'src/app/shared/paginator/paginator.component';
-import { AutoFocusDirective } from 'src/app/shared/select/auto-focus.directive';
 import { OrderByPipe } from 'src/app/shared/sorting/order-by.pipe';
 import { ExamParticipationComponent } from './exam-participation.component';
 
@@ -24,7 +23,6 @@ import { ExamParticipationComponent } from './exam-participation.component';
     standalone: true,
     imports: [
         FormsModule,
-        AutoFocusDirective,
         NgbDropdown,
         NgbDropdownToggle,
         NgbDropdownMenu,