Prod release 01/07/26

apps/concierge/src/app/parking/parking-special-request-modal.component.ts

@@ -75,11 +75,9 @@ export class ParkingSpecialRequestModalComponent {
         const urls: string[] = (
             this._data.booking?.extension_data?.attachments || []
         ).filter((url) => !!url);
-        const names: string[] =
-            this._data.booking?.extension_data?.p2_document_names || [];
-        return urls.map((url, index) => ({
+        return urls.map((url) => ({
             url,
-            name: names[index] || this._fileNameFromUrl(url),
+            name: this._fileNameFromUrl(url),
         }));
     })();
 

apps/concierge/src/app/parking/parking.component.ts

@@ -38,7 +38,7 @@ import { ParkingTopbarComponent } from './parking-topbar.component';
                                         | translate
                                 }}
                             </a>
-                            @if (!hide_users_and_vehicles) {
+                            @if (!hide_users) {
                                 <a
                                     mat-tab-link
                                     [routerLink]="[
@@ -54,6 +54,8 @@ import { ParkingTopbarComponent } from './parking-topbar.component';
                                             | translate
                                     }}
                                 </a>
+                            }
+                            @if (!hide_vehicles) {
                                 <a
                                     mat-tab-link
                                     [routerLink]="[
@@ -163,6 +165,20 @@ export class ParkingComponent extends AsyncHandler implements OnInit {
         return !!this._settings.get('app.parking.hide_users_and_vehicles');
     }
 
+    public get hide_users() {
+        return (
+            this.hide_users_and_vehicles ||
+            !!this._settings.get('app.parking.hide_users')
+        );
+    }
+
+    public get hide_vehicles() {
+        return (
+            this.hide_users_and_vehicles ||
+            !!this._settings.get('app.parking.hide_vehicles')
+        );
+    }
+
     public get is_admin() {
         const groups = currentUser().groups || [];
         const admin_group = this._settings.get('app.admin_group') || 'admin';
@@ -203,8 +219,8 @@ export class ParkingComponent extends AsyncHandler implements OnInit {
         this.section.set(section as any);
         if (
             section === 'manage' &&
-            this.hide_users_and_vehicles &&
-            ['fleet', 'users'].includes(current_view)
+            ((current_view === 'users' && this.hide_users) ||
+                (current_view === 'fleet' && this.hide_vehicles))
         ) {
             this.view.set('spaces');
             void this._router.navigate(

apps/concierge/src/app/reports/parking/parking-report-list.component.ts

@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { Component, computed, inject, input } from '@angular/core';
 import { MatRippleModule } from '@angular/material/core';
 import { MatTooltipModule } from '@angular/material/tooltip';
+import { ParkingSpacePipe } from '@placeos/assets';
 import { downloadFile, i18n, jsonToCsv } from '@placeos/common';
 import {
     IconComponent,
@@ -19,9 +20,9 @@ import { ParkingReportService } from './parking-report.service';
 
 const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
     {
-        label: 'Parking space',
+        label: 'Bay number',
         description:
-            'Uses asset name, extension asset name, description, then asset ID as fallback.',
+            'Resolves the booking asset ID to the parking space identifier.',
     },
     {
         label: 'Duration',
@@ -55,11 +56,7 @@ const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
             class="border-base-200 bg-base-100 m-4 overflow-hidden rounded-sm border"
         >
             <div class="border-base-200 flex items-center border-b px-4 py-2">
-                <h3 class="flex-1 text-xl font-bold">
-                    {{
-                        'APP.CONCIERGE.REPORTS_PARKING_UTIL_HEADER' | translate
-                    }}
-                </h3>
+                <h3 class="flex-1 text-xl font-bold">Parking Bookings</h3>
                 @if (!print()) {
                     <button
                         icon
@@ -84,8 +81,9 @@ const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
                 [data]="parking_bookings()"
                 [columns]="[
                     {
-                        key: 'parking_name',
-                        name: 'RESOURCE.PARKING_SPACE' | translate,
+                        key: 'asset_id',
+                        name: 'APP.CONCIERGE.PARKING_BAY_NUMBER' | translate,
+                        content: bay_template,
                     },
                     {
                         key: 'date',
@@ -101,6 +99,10 @@ const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
                         key: 'host',
                         name: 'APP.CONCIERGE.PARKING_RESERVED_FOR' | translate,
                     },
+                    {
+                        key: 'plate_number',
+                        name: 'EXPLORE.PARKING_PLATE_NUMBER' | translate,
+                    },
                     {
                         key: 'checked_in',
                         name: 'COMMON.CHECKED_IN' | translate,
@@ -121,6 +123,17 @@ const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
                     'APP.CONCIERGE.REPORTS_DAILY_EMPTY' | translate
                 "
             ></simple-table>
+            <ng-template #bay_template let-id="data">
+                <div class="p-4">
+                    @if (id) {
+                        {{ (id | parkingSpace | async)?.identifier || id }}
+                    } @else {
+                        <span class="opacity-30">
+                            {{ 'COMMON.EMPTY' | translate }}
+                        </span>
+                    }
+                </div>
+            </ng-template>
             <ng-template #date_template let-row="row">
                 <div class="p-4">
                     {{ row.date | date: 'mediumDate' }}
@@ -154,6 +167,7 @@ const TABLE_METRIC_GUIDE: ReportMetricGuideItem[] = [
         SimpleTableComponent,
         DurationPipe,
         TranslatePipe,
+        ParkingSpacePipe,
         IconComponent,
         MatRippleModule,
         MatTooltipModule,
@@ -171,15 +185,12 @@ export class ParkingReportListComponent {
         const list = [];
         for (const booking of this._bookings()) {
             list.push({
-                parking_name:
-                    booking.asset_name ||
-                    booking.extension_data?.asset_name ||
-                    booking.description ||
-                    booking.asset_id,
+                asset_id: booking.asset_id,
                 date: booking.date,
                 duration: booking.duration,
                 all_day: booking.all_day,
                 host: booking.user_name || booking.user_email,
+                plate_number: booking.extension_data?.plate_number || '',
                 checked_in: i18n(
                     booking.checked_in ? 'COMMON.TRUE' : 'COMMON.FALSE',
                 ),

apps/concierge/src/app/ui/app-settings/concierge-settings-form-modal.component.ts

@@ -1554,7 +1554,15 @@ import { UploadButtonComponent } from './upload-button.component';
                                         "
                                     ></settings-toggle>
                                     <settings-toggle
-                                        label="Hide users and vehicle tabs"
+                                        label="Hide user tab"
+                                        [formField]="form.parking.hide_users"
+                                    ></settings-toggle>
+                                    <settings-toggle
+                                        label="Hide vehicle tab"
+                                        [formField]="form.parking.hide_vehicles"
+                                    ></settings-toggle>
+                                    <settings-toggle
+                                        label="Hide user and vehicle tabs"
                                         [formField]="
                                             form.parking.hide_users_and_vehicles
                                         "
@@ -1927,6 +1935,8 @@ export class ConciergeSettingsFormModalComponent implements OnInit {
             show_waitlist: true,
             hide_bay_number: false,
             hide_level_selector_on_booking_list: false,
+            hide_users: false,
+            hide_vehicles: false,
             hide_users_and_vehicles: false,
             hide_assign_space: false,
             allow_deleting: false,

apps/concierge/src/environments/settings.ts

@@ -48,6 +48,8 @@ const app = {
         disable_styles: false,
         hide_bay_number: false,
         hide_level_selector_on_booking_list: false,
+        hide_users: false,
+        hide_vehicles: false,
         hide_users_and_vehicles: false,
         hide_availability_counter: false,
         hide_assign_space: false,

apps/concierge/src/tests/parking/parking.component.spec.ts

@@ -45,6 +45,8 @@ describe('ParkingComponent', () => {
     beforeEach(() => {
         settings_map = {
             'app.parking.show_requests': true,
+            'app.parking.hide_users': false,
+            'app.parking.hide_vehicles': false,
             'app.parking.hide_users_and_vehicles': false,
             'app.feature_groups': { 'parking-requests': ['parking-team'] },
             'app.admin_group': 'admin',
@@ -99,7 +101,43 @@ describe('ParkingComponent', () => {
         );
     });
 
-    it('should redirect hidden user and vehicle management tabs to spaces', () => {
+    it('should redirect hidden user management tab to spaces', () => {
+        const router = spectator.inject(Router);
+        jest.spyOn(router, 'navigate').mockResolvedValue(true);
+        settings_map['app.parking.hide_users'] = true;
+        Object.defineProperty(router, 'url', {
+            value: '/book/parking/manage/users',
+            configurable: true,
+        });
+
+        (spectator.component as any)._updatePath();
+
+        expect(spectator.component.view()).toBe('spaces');
+        expect(router.navigate).toHaveBeenCalledWith(
+            ['/book', 'parking', 'manage', 'spaces'],
+            { replaceUrl: true },
+        );
+    });
+
+    it('should redirect hidden vehicle management tab to spaces', () => {
+        const router = spectator.inject(Router);
+        jest.spyOn(router, 'navigate').mockResolvedValue(true);
+        settings_map['app.parking.hide_vehicles'] = true;
+        Object.defineProperty(router, 'url', {
+            value: '/book/parking/manage/fleet',
+            configurable: true,
+        });
+
+        (spectator.component as any)._updatePath();
+
+        expect(spectator.component.view()).toBe('spaces');
+        expect(router.navigate).toHaveBeenCalledWith(
+            ['/book', 'parking', 'manage', 'spaces'],
+            { replaceUrl: true },
+        );
+    });
+
+    it('should keep the combined user and vehicle tab setting working', () => {
         const router = spectator.inject(Router);
         jest.spyOn(router, 'navigate').mockResolvedValue(true);
         settings_map['app.parking.hide_users_and_vehicles'] = true;

apps/visitor-kiosk/src/app/checkin/checkin-details.component.ts

@@ -128,7 +128,7 @@ import { CheckinStateService } from './checkin-state.service';
                         </mat-form-field>
                     </div>
                 }
-                <button next btn matRipple (click)="updateGuest()">
+                <button next type="button" btn matRipple (click)="updateGuest()">
                     {{ 'APP.VISITOR_KIOSK.CONTINUE' | translate }}
                 </button>
                 <a

apps/visitor-kiosk/src/app/visitor-registration.component.ts

@@ -11,6 +11,7 @@ import { startOfMinute } from 'date-fns';
 
 import {
     AsyncHandler,
+    EMPTY_USER,
     getInvalidSignalFields,
     i18n,
     isEmptyUser,
@@ -304,7 +305,10 @@ export class VisitorRegistrationComponent
     });
 
     public setHost(user: User | null) {
-        this._booking_form.model.update((m) => ({ ...m, user }));
+        this._booking_form.model.update((m) => ({
+            ...m,
+            user: user || EMPTY_USER,
+        }));
     }
 
     public setDuration(duration: number) {
@@ -324,6 +328,8 @@ export class VisitorRegistrationComponent
             ...m,
             booking_type: 'visitor',
             title: 'Visit',
+            // Always ask for the host; null is sanitized back to currentUser().
+            user: EMPTY_USER,
         }));
         setTimeout(() => {
             if (this.allow_self_registration()) return;
@@ -343,6 +349,13 @@ export class VisitorRegistrationComponent
                 }),
             );
         }
+        if (!this.host()) {
+            return notifyError(
+                i18n('FORM.INVALID_FIELDS', {
+                    field_list: i18n('APP.VISITOR_KIOSK.HOST'),
+                }),
+            );
+        }
         this.loading.set(true);
         try {
             const value = this._booking_form.model();

apps/visitor-kiosk/src/tests/checkin/checkin-covid.component.spec.ts

@@ -5,7 +5,10 @@ import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
 import { CheckinCovidComponent } from '../../app/checkin/checkin-covid.component';
 import { CheckinStateService } from '../../app/checkin/checkin-state.service';
 
-jest.mock('@placeos/common');
+jest.mock('@placeos/common', () => ({
+    ...jest.requireActual('@placeos/common'),
+    notifyError: jest.fn(),
+}));
 
 import { FormsModule } from '@angular/forms';
 import * as common_mod from '@placeos/common';
@@ -26,14 +29,16 @@ describe('CheckinCovidComponent', () => {
         imports: [MatRadioModule, FormsModule],
     });
 
-    beforeEach(() => (spectator = createComponent()));
+    beforeEach(() => {
+        (common_mod.notifyError as jest.Mock).mockClear();
+        spectator = createComponent();
+    });
 
     it('should create component', () => {
         expect(spectator.component).toBeTruthy();
     });
 
     it('should allow confirming questions', () => {
-        (common_mod.notifyError as any) = jest.fn();
         spectator.component.confirm();
         expect(common_mod.notifyError).toHaveBeenCalledWith(
             'Please select yes or no for each question',

apps/visitor-kiosk/src/tests/visitor-registration.component.spec.ts

@@ -4,6 +4,8 @@ import { Router } from '@angular/router';
 import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
 import { BookingFormService } from '@placeos/bookings';
 import {
+    EMPTY_USER,
+    isEmptyUser,
     OrganisationService,
     Region,
     SettingsService,
@@ -85,6 +87,14 @@ describe('VisitorRegistrationComponent', () => {
         expect(spectator.component.host()).toEqual(host);
     });
 
+    it('should keep cleared host blank in the backing model', () => {
+        spectator.component.setHost(null);
+
+        expect(spectator.component.form_value().user).toEqual(EMPTY_USER);
+        expect(isEmptyUser(spectator.component.form_value().user)).toBe(true);
+        expect(spectator.component.host()).toBeNull();
+    });
+
     it('should keep the host field bindable when the user value is cleared', fakeAsync(() => {
         const console_error = jest
             .spyOn(console, 'error')

apps/workplace/src/app/book/desk-flow/desk-flow-form.component.ts

@@ -96,11 +96,17 @@ export class NewDeskFlowFormComponent implements OnInit {
     public level = '';
     public levels = [];
 
-    /** Block the form when the user has a reserved desk and isn't allowed to book another */
+    /**
+     * Blanket-block the form only when the user has a reserved desk and booking
+     * with a reserved desk is disallowed entirely. When it is allowed, a
+     * `prevent_self_booking_if_assigned_resource` restriction blocks only their
+     * own bookings (enforced at submit), so the form stays open for booking on
+     * behalf of others.
+     */
     public readonly show_reserved_desk_overlay = computed(
         () =>
             this._state.has_assigned_desk() &&
-            !this._state.canBookWithReservedDesk(),
+            !this._state.allowsBookingWithReservedResource('desk'),
     );
 
     public get form() {