Update booking calendar component to utilize session service for admin checks

Author: VirmasaloA

README.md

@@ -9,7 +9,7 @@ SPDX-License-Identifier: EUPL-1.2
 EXAM Quickstart for developers
 =====================================
 
-1.  Prerequisites: install SBT, Java (21), Node (>= 18) and PostgreSQL (>= 9.4).
+1.  Prerequisites: install SBT, Java (25), Node (>= 18) and PostgreSQL (>= 9.4).
 
 2.  Create PostgreSQL database
 

ui/src/app/calendar/booking-calendar.component.ts

@@ -24,6 +24,7 @@ import timeGridPlugin from '@fullcalendar/timegrid';
 import { TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
 import type { Accessibility, ExamRoom } from 'src/app/reservation/reservation.model';
+import { SessionService } from 'src/app/session/session.service';
 import { CalendarService } from './calendar.service';
 
 @Component({
@@ -55,19 +56,22 @@ export class BookingCalendarComponent implements OnInit, AfterViewInit {
     room = input.required<ExamRoom>();
     visible = input(false);
     passwordVerified = input(false);
-    isAdmin = input(false);
     minDate = input<Date>();
     maxDate = input<Date>();
     accessibilities = input<Accessibility[]>([]);
 
     calendarOptions = signal<CalendarOptions>({});
     searchStart = DateTime.now().startOf('week').toISO();
     searchEnd = DateTime.now().endOf('week').toISO();
+    isAdmin = signal(false);
 
     private translate = inject(TranslateService);
     private Calendar = inject(CalendarService);
+    private Session = inject(SessionService);
 
     constructor() {
+        this.isAdmin.set(this.Session.getUser().isAdmin);
+
         this.calendarOptions.set({
             plugins: [luxon2Plugin, timeGridPlugin],
             initialView: 'timeGridWeek',

ui/src/app/calendar/helpers/slot-picker.component.html

@@ -96,7 +96,6 @@ <h2 class="calendar-phase-title">{{ sequenceNumber }}. {{ 'i18n_calendar_phase_2
                         [accessibilities]="accessibilities"
                         [visible]="selectedRoom !== undefined"
                         [passwordVerified]="passwordVerified()"
-                        [isAdmin]="isAdmin"
                     >
                     </xm-booking-calendar>
                 </div>

ui/src/app/calendar/helpers/slot-picker.component.ts

@@ -30,7 +30,6 @@ import { CalendarService } from 'src/app/calendar/calendar.service';
 import { PasswordPromptComponent } from 'src/app/calendar/helpers/password-prompt.component';
 import { MaintenancePeriod } from 'src/app/facility/facility.model';
 import type { Accessibility, ExamRoom } from 'src/app/reservation/reservation.model';
-import { SessionService } from 'src/app/session/session.service';
 import { updateList } from 'src/app/shared/miscellaneous/helpers';
 import { AccessibilityPickerComponent } from './accessibility-picker.component';
 import { SelectedRoomComponent } from './selected-room.component';
@@ -86,11 +85,6 @@ export class SlotPickerComponent implements OnInit, OnChanges {
     private route = inject(ActivatedRoute);
     private toast = inject(ToastrService);
     private Calendar = inject(CalendarService);
-    private session = inject(SessionService);
-
-    get isAdmin(): boolean {
-        return this.session.getUser()?.isAdmin ?? false;
-    }
 
     ngOnInit() {
         this.examId.set(Number(this.route.snapshot.paramMap.get('id')));

ui/src/app/facility/rooms/availability.component.html

@@ -58,11 +58,6 @@
 
 <div class="row">
     <div class="col-md-12">
-        <xm-booking-calendar
-            (moreEventsNeeded)="refresh($event)"
-            [room]="room"
-            [visible]="true"
-            [isAdmin]="isAdmin"
-        ></xm-booking-calendar>
+        <xm-booking-calendar (moreEventsNeeded)="refresh($event)" [room]="room" [visible]="true"></xm-booking-calendar>
     </div>
 </div>

ui/src/app/facility/rooms/availability.component.ts

@@ -15,7 +15,6 @@ import type { OpeningHours } from 'src/app/calendar/calendar.model';
 import { CalendarService } from 'src/app/calendar/calendar.service';
 import { Availability } from 'src/app/facility/facility.model';
 import type { ExamRoom, ExceptionWorkingHours } from 'src/app/reservation/reservation.model';
-import { SessionService } from 'src/app/session/session.service';
 import { RoomService } from './room.service';
 
 @Component({
@@ -40,11 +39,6 @@ export class AvailabilityComponent implements OnInit {
     private toast = inject(ToastrService);
     private roomService = inject(RoomService);
     private calendar = inject(CalendarService);
-    private session = inject(SessionService);
-
-    get isAdmin(): boolean {
-        return this.session.getUser()?.isAdmin ?? false;
-    }
 
     ngOnInit() {
         if (!this.room) {

ui/tsconfig.json

@@ -5,6 +5,7 @@
         "baseUrl": ".",
         "outDir": "./dist/out-tsc",
         "forceConsistentCasingInFileNames": true,
+        "skipLibCheck": true,
         "esModuleInterop": true,
         "strict": true,
         "noImplicitOverride": true,