Merge branch 'develop' into custom/HIO687AS

MrYuion · MrYuion · commit 0ea02b9b7ba7 · 2026-02-17T16:24:38.000+11:00
diff --git a/apps/concierge/src/app/parking/parking-topbar.component.ts b/apps/concierge/src/app/parking/parking-topbar.component.ts
@@ -127,33 +127,35 @@ import { ParkingStateService } from './parking-state.service';
                     </a>
                 </div>
             }
-            <mat-form-field appearance="outline" class="no-subscript w-56">
-                <mat-select
-                    [(ngModel)]="zones"
-                    (ngModelChange)="updateZones($event)"
-                    [placeholder]="'COMMON.LEVEL_ALL' | translate"
-                    multiple
-                >
-                    @for (level of levels | async; track level) {
-                        <mat-option [value]="level.id">
-                            <div class="flex flex-col-reverse">
-                                @if (use_region) {
-                                    <div class="text-xs opacity-30">
-                                        {{
-                                            (level.parent_id | building)
-                                                ?.display_name
-                                        }}
-                                        <span class="opacity-0"> - </span>
+            @if (!is_requests_view()) {
+                <mat-form-field appearance="outline" class="no-subscript w-56">
+                    <mat-select
+                        [(ngModel)]="zones"
+                        (ngModelChange)="updateZones($event)"
+                        [placeholder]="'COMMON.LEVEL_ALL' | translate"
+                        multiple
+                    >
+                        @for (level of levels | async; track level) {
+                            <mat-option [value]="level.id">
+                                <div class="flex flex-col-reverse">
+                                    @if (use_region) {
+                                        <div class="text-xs opacity-30">
+                                            {{
+                                                (level.parent_id | building)
+                                                    ?.display_name
+                                            }}
+                                            <span class="opacity-0"> - </span>
+                                        </div>
+                                    }
+                                    <div>
+                                        {{ level.display_name || level.name }}
                                     </div>
-                                }
-                                <div>
-                                    {{ level.display_name || level.name }}
                                 </div>
-                            </div>
-                        </mat-option>
-                    }
-                </mat-select>
-            </mat-form-field>
+                            </mat-option>
+                        }
+                    </mat-select>
+                </mat-form-field>
+            }
             <div class="w-px min-w-2 flex-1"></div>
             @if (section() === 'manage') {
                 <button
@@ -261,11 +263,13 @@ export class ParkingTopbarComponent extends AsyncHandler implements OnInit {
         if (!this._router.url.includes('parking')) return;
         this._router.navigate([], {
             relativeTo: this._route,
-            queryParams: { zone_ids: z.join(',') },
+            queryParams: { zone_ids: z.length ? z.join(',') : null },
             queryParamsHandling: 'merge',
         });
         this._state.setOptions({ zones: z });
     };
+    public readonly is_requests_view = () =>
+        this.section() === 'events' && this.view() === 'requests';
 
     public get use_region() {
         return !!this._settings.get('app.use_region');
@@ -288,6 +292,10 @@ export class ParkingTopbarComponent extends AsyncHandler implements OnInit {
         this.subscription(
             'route.query',
             this._route.queryParamMap.subscribe((params) => {
+                if (this.is_requests_view()) {
+                    this.clearZones();
+                    return;
+                }
                 if (
                     params.has('zone_ids') &&
                     this._router.url.includes('parking')
@@ -309,6 +317,10 @@ export class ParkingTopbarComponent extends AsyncHandler implements OnInit {
             'levels',
             this._state.levels.pipe(debounceTime(100)).subscribe((levels) => {
                 if (this.use_region) return;
+                if (this.is_requests_view()) {
+                    this.clearZones();
+                    return;
+                }
                 this.zones = this.zones.filter((zone) =>
                     levels.find((lvl) => lvl.id === zone),
                 );
@@ -348,5 +360,33 @@ export class ParkingTopbarComponent extends AsyncHandler implements OnInit {
         const [section, view] = parts.slice(-2);
         this.section.set(section as any);
         this.view.set(view.split('?')[0] as any);
+        if (this.is_requests_view()) {
+            this.clearZones();
+            return;
+        }
+        this.selectDefaultZoneForManage();
+    }
+
+    private clearZones() {
+        const has_query_param = this._route.snapshot.queryParamMap.has(
+            'zone_ids',
+        );
+        if (!this.zones.length && !has_query_param) {
+            this._state.setOptions({ zones: [] });
+            return;
+        }
+        this.zones = [];
+        this.updateZones([]);
+    }
+
+    private async selectDefaultZoneForManage() {
+        if (this.section() !== 'manage' || this.use_region || this.zones.length) {
+            return;
+        }
+        const levels = await nextValueFrom(this.levels);
+        const first_level = levels[0]?.id;
+        if (!first_level) return;
+        this.zones = [first_level];
+        this.updateZones(this.zones);
     }
 }
diff --git a/libs/bookings/src/lib/booking-form.service.ts b/libs/bookings/src/lib/booking-form.service.ts
@@ -584,13 +584,13 @@ export class BookingFormService extends AsyncHandler {
         details.loading(i18n('BOOKINGS.CONFIRM_LOADING'));
         if (options.group) {
             await this.postFormForGroup().catch((_) => {
-                notifyError(JSON.stringify(_));
+                notifyError(this._error_message(_));
                 details.close();
                 throw _;
             });
         } else
             await this.postForm().catch((_) => {
-                notifyError(JSON.stringify(_));
+                notifyError(this._error_message(_));
                 details.close();
                 throw _;
             });
@@ -778,7 +778,8 @@ export class BookingFormService extends AsyncHandler {
         if (!group) throw i18n('BOOKINGS.GROUP_NOT_SET');
         const rollback_on_group_error =
             this.setting('rollback_group_bookings') === true;
-        const extra_members = members.filter(
+        const member_list = members || [];
+        const extra_members = member_list.filter(
             (_) => _.email !== currentUser().email,
         );
         if (extra_members.length <= 0) throw i18n('BOOKINGS.GROUP_NO_MEMBERS');
@@ -788,9 +789,12 @@ export class BookingFormService extends AsyncHandler {
             (_) => _.id === form.asset_id || _.map_id === form.asset_id,
         );
         if (!active_resource) {
-            throw 'Selected resource is no longer available';
+            throw i18n('BOOKINGS.DESK_AVAILABLE_ERROR');
         }
         const level = this._org.levelWithID([active_resource.zone?.id]);
+        if (!level?.map_id) {
+            throw i18n('BOOKINGS.GROUP_MAP_UNAVAILABLE');
+        }
         const resources = [
             active_resource,
             ...(await this._getNearbyResources(
@@ -804,18 +808,37 @@ export class BookingFormService extends AsyncHandler {
             [currentUser(), ...extra_members],
             'email',
         );
+        if (resources.length < group_members.length) {
+            throw i18n('BOOKINGS.GROUP_INSUFFICIENT_RESOURCES', {
+                available: resources.length,
+                members: group_members.length,
+            });
+        }
+        const unavailable_errors: string[] = [];
         const available = await Promise.all(
-            group_members.map((_, idx) => {
+            group_members.map(async (member, idx) => {
                 const resource = resources[idx];
-                if (!resource) return false;
-                return this._checkResourceAvailable(
-                    {
-                        ...form,
-                        asset_id: resource.map_id || resource.id,
-                        user_email: _.email,
-                    },
-                    type,
-                );
+                if (!resource) {
+                    unavailable_errors.push(
+                        `${member.name || member.email}: ${i18n('BOOKINGS.GROUP_MEMBER_NO_RESOURCE')}`,
+                    );
+                    return false;
+                }
+                try {
+                    return await this._checkResourceAvailable(
+                        {
+                            ...form,
+                            asset_id: resource.map_id || resource.id,
+                            user_email: member.email,
+                        },
+                        type,
+                    );
+                } catch (error) {
+                    unavailable_errors.push(
+                        `${member.name || member.email}: ${this._error_message(error)}`,
+                    );
+                    return false;
+                }
             }),
         );
         const unavailable = group_members.filter((_, idx) => !available[idx]);
@@ -858,27 +881,43 @@ export class BookingFormService extends AsyncHandler {
                         : [this._org.organisation.id, this._org.region?.id]
                     ).filter((_) => _),
                 });
-                const bkn = await this.postForm(true);
+                const bkn = await this.postForm(true).catch((error) => {
+                    throw `${user.name || user.email}: ${this._error_message(error)}`;
+                });
                 if (bkn?.id) booking_ids.push(bkn.id);
                 if (bkn.id && !id) id = bkn.id;
                 if (bkn.user_email === currentUser().email) user_booking = bkn;
             }
             if (unavailable.length) {
+                const unavailable_error = unavailable_errors.length
+                    ? unavailable_errors.join('\n')
+                    : group_error;
                 if (rollback_on_group_error) {
                     await this.rollbackGroupBookings(booking_ids);
-                    throw group_error;
+                    throw unavailable_error;
                 }
-                notifyWarn(group_error);
+                notifyWarn(unavailable_error);
             }
         } catch (error) {
             if (rollback_on_group_error && booking_ids.length) {
                 await this.rollbackGroupBookings(booking_ids);
             }
-            throw error;
+            throw this._error_message(error);
         }
         return user_booking;
     }
 
+    private _error_message(error: any) {
+        if (typeof error === 'string') return error;
+        if (error instanceof Error && error.message) return error.message;
+        if (typeof error?.error === 'string') return error.error;
+        if (typeof error?.message === 'string') return error.message;
+        if (typeof error?.error?.message === 'string') {
+            return error.error.message;
+        }
+        return i18n('BOOKINGS.ERROR_GENERIC');
+    }
+
     private async rollbackGroupBookings(booking_ids: string[]) {
         const rollback_errors = (
             await Promise.allSettled(
diff --git a/shared/assets/locale/ar.json b/shared/assets/locale/ar.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "لا توجد مجموعة متاحة للحجز لها.",
         "GROUP_NO_MEMBERS": "لا يوجد أعضاء في مجموعتك للحجز لهم.",
         "GROUP_SOME_HAVE_BOOKINGS": "بعض أعضاء مجموعتك لديهم بالفعل حجز مكتب. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "تعذر العثور على خريطة للمورد المحدد.",
+        "GROUP_INSUFFICIENT_RESOURCES": "يتوفر فقط {{ available }} من الموارد القريبة لـ {{ members }} من أعضاء المجموعة.",
+        "GROUP_MEMBER_NO_RESOURCE": "لا يوجد مورد قريب متاح.",
+        "ERROR_GENERIC": "فشل إكمال طلب الحجز.",
         "NO_USER": "لم يتم تحديد مستخدم للحجز له.",
         "VISITOR_BOOKED": "{{ name }} لديه بالفعل دعوة للوقت المحدد.",
         "RESOURCE_BOOKED": "{{ name }} غير متاح في الوقت المحدد",
diff --git a/shared/assets/locale/en-AU.json b/shared/assets/locale/en-AU.json
@@ -563,6 +563,10 @@
         "GROUP_NOT_SET": "No group available to book for.",
         "GROUP_NO_MEMBERS": "No members in your group to book for.",
         "GROUP_SOME_HAVE_BOOKINGS": "Some members of your group already have a desk booking. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Unable to locate a map for the selected resource.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Only {{ available }} nearby resources are available for {{ members }} group members.",
+        "GROUP_MEMBER_NO_RESOURCE": "No nearby resource is available.",
+        "ERROR_GENERIC": "Failed to complete booking request.",
         "NO_USER": "No user was selected to book for.",
         "VISITOR_BOOKED": "{{ name }} already has an invite for the selected time.",
         "RESOURCE_BOOKED": "{{ name }} is not available at the selected time",
diff --git a/shared/assets/locale/en-GB.json b/shared/assets/locale/en-GB.json
@@ -520,6 +520,10 @@
         "GROUP_NOT_SET": "No group available to book for.",
         "GROUP_NO_MEMBERS": "No members in your group to book for.",
         "GROUP_SOME_HAVE_BOOKINGS": "Some members of your group already have a desk booking. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Unable to locate a map for the selected resource.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Only {{ available }} nearby resources are available for {{ members }} group members.",
+        "GROUP_MEMBER_NO_RESOURCE": "No nearby resource is available.",
+        "ERROR_GENERIC": "Failed to complete booking request.",
         "NO_USER": "No user was selected to book for.",
         "VISITOR_BOOKED": "{{ name }} already has an invite for the selected time.",
         "RESOURCE_BOOKED": "{{ name }} is not available at the selected time",
diff --git a/shared/assets/locale/en-US.json b/shared/assets/locale/en-US.json
@@ -520,6 +520,10 @@
         "GROUP_NOT_SET": "No group available to book for.",
         "GROUP_NO_MEMBERS": "No members in your group to book for.",
         "GROUP_SOME_HAVE_BOOKINGS": "Some members of your group already have a desk booking. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Unable to locate a map for the selected resource.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Only {{ available }} nearby resources are available for {{ members }} group members.",
+        "GROUP_MEMBER_NO_RESOURCE": "No nearby resource is available.",
+        "ERROR_GENERIC": "Failed to complete booking request.",
         "NO_USER": "No user was selected to book for.",
         "VISITOR_BOOKED": "{{ name }} already has an invite for the selected time.",
         "RESOURCE_BOOKED": "{{ name }} is not available at the selected time",
diff --git a/shared/assets/locale/es.json b/shared/assets/locale/es.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "No hay grupo disponible para reservar.",
         "GROUP_NO_MEMBERS": "No hay miembros en su grupo para los que reservar.",
         "GROUP_SOME_HAVE_BOOKINGS": "Algunos miembros de su grupo ya tienen una reserva de escritorio. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "No se puede encontrar un mapa para el recurso seleccionado.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Solo hay {{ available }} recursos cercanos disponibles para {{ members }} miembros del grupo.",
+        "GROUP_MEMBER_NO_RESOURCE": "No hay recursos cercanos disponibles.",
+        "ERROR_GENERIC": "No se pudo completar la solicitud de reserva.",
         "NO_USER": "No se seleccionó ningún usuario para el que reservar.",
         "VISITOR_BOOKED": "{{ name }} ya tiene una invitación para la hora seleccionada.",
         "RESOURCE_BOOKED": "{{ name }} no está disponible a la hora seleccionada",
diff --git a/shared/assets/locale/fr-CA.json b/shared/assets/locale/fr-CA.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "Aucun groupe disponible pour la réservation.",
         "GROUP_NO_MEMBERS": "Aucun membre dans votre groupe pour lequel réserver.",
         "GROUP_SOME_HAVE_BOOKINGS": "Certains membres de votre groupe ont déjà une réservation de bureau. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Impossible de localiser une carte pour la ressource sélectionnée.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Seulement {{ available }} ressources à proximité sont disponibles pour {{ members }} membres du groupe.",
+        "GROUP_MEMBER_NO_RESOURCE": "Aucune ressource à proximité n'est disponible.",
+        "ERROR_GENERIC": "Échec de la finalisation de la demande de réservation.",
         "NO_USER": "Aucun utilisateur n'a été sélectionné pour la réservation.",
         "VISITOR_BOOKED": "{{ name }} a déjà une invitation pour l'heure sélectionnée.",
         "RESOURCE_BOOKED": "{{ name }} n'est pas disponible à l'heure sélectionnée",
diff --git a/shared/assets/locale/fr.json b/shared/assets/locale/fr.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "Aucun groupe disponible pour réserver.",
         "GROUP_NO_MEMBERS": "Aucun membre dans votre groupe pour réserver.",
         "GROUP_SOME_HAVE_BOOKINGS": "Certains membres de votre groupe ont déjà une réservation de bureau. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Impossible de localiser une carte pour la ressource sélectionnée.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Seulement {{ available }} ressources à proximité sont disponibles pour {{ members }} membres du groupe.",
+        "GROUP_MEMBER_NO_RESOURCE": "Aucune ressource à proximité n'est disponible.",
+        "ERROR_GENERIC": "Échec de la finalisation de la demande de réservation.",
         "NO_USER": "Aucun utilisateur n’a été sélectionné pour la réservation.",
         "VISITOR_BOOKED": "{{ name }} a déjà une invitation pour la plage horaire sélectionnée.",
         "RESOURCE_BOOKED": "{{ name }} n’est pas disponible pour la plage horaire sélectionnée",
diff --git a/shared/assets/locale/it.json b/shared/assets/locale/it.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "Nessun gruppo disponibile per la prenotazione.",
         "GROUP_NO_MEMBERS": "Nessun membro nel tuo gruppo da prenotare.",
         "GROUP_SOME_HAVE_BOOKINGS": "Alcuni membri del tuo gruppo hanno già una prenotazione per la scrivania. [{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "Impossibile trovare una mappa per la risorsa selezionata.",
+        "GROUP_INSUFFICIENT_RESOURCES": "Sono disponibili solo {{ available }} risorse vicine per {{ members }} membri del gruppo.",
+        "GROUP_MEMBER_NO_RESOURCE": "Non è disponibile alcuna risorsa nelle vicinanze.",
+        "ERROR_GENERIC": "Impossibile completare la richiesta di prenotazione.",
         "NO_USER": "Nessun utente è stato selezionato per la prenotazione.",
         "VISITOR_BOOKED": "{{ name }} ha già un invito per l'orario selezionato.",
         "RESOURCE_BOOKED": "{{ name }} non è disponibile per l'orario selezionato",
diff --git a/shared/assets/locale/ja-JP.json b/shared/assets/locale/ja-JP.json
@@ -521,6 +521,10 @@
         "GROUP_NOT_SET": "予約可能なグループがありません。",
         "GROUP_NO_MEMBERS": "グループに予約するメンバーがいません。",
         "GROUP_SOME_HAVE_BOOKINGS": "グループの一部のメンバーは既にデスクを予約しています。[{{ members }}]",
+        "GROUP_MAP_UNAVAILABLE": "選択したリソースのマップが見つかりません。",
+        "GROUP_INSUFFICIENT_RESOURCES": "{{ members }} 人のグループメンバーに対して、近くの利用可能なリソースは {{ available }} 件のみです。",
+        "GROUP_MEMBER_NO_RESOURCE": "近くに利用可能なリソースがありません。",
+        "ERROR_GENERIC": "予約リクエストを完了できませんでした。",
         "NO_USER": "予約するユーザーが選択されていません。",
         "VISITOR_BOOKED": "{{ name }}は選択された時間に既に招待されています。",
         "RESOURCE_BOOKED": "{{ name }}は選択された時間に利用できません",
diff --git a/shared/assets/locale/pt.json b/shared/assets/locale/pt.json
diff --git a/shared/assets/locale/zh.json b/shared/assets/locale/zh.json
