Skip to content

Commit b4e1ff6

Browse files
committed
Don't show availabilities on requests page if no bookings are available.
1 parent 1c87a60 commit b4e1ff6

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/app/admin/components/booking-requests/booking-requests.component.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<div class="admin-container--main">
1212
<h3>Booking Requests</h3>
1313

14+
<div *ngIf="allBookingRequests.length == 0" class="booking-requests-section">
15+
<div class="booking-requests-section-title">
16+
No requests to reserve VISA resources have been made.
17+
</div>
18+
</div>
19+
1420
<div *ngIf="pendingBookingRequests.length > 0" class="booking-requests-section">
1521
<div class="booking-requests-section-title">
1622
Pending requests
@@ -25,7 +31,7 @@ <h3>Booking Requests</h3>
2531
<visa-admin-booking-request-list [bookingRequests]="acceptedBookingRequests"></visa-admin-booking-request-list>
2632
</div>
2733

28-
<div class="booking-requests-section">
34+
<div *ngIf="allBookingRequests.length > 0" class="booking-requests-section">
2935
<div class="booking-requests-section-title">
3036
Availability of requested resources
3137
</div>

src/app/admin/components/booking-requests/booking-requests.component.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,14 @@ export class BookingRequestsComponent implements OnInit, OnDestroy {
116116
this._allBookingRequests = bookingRequests;
117117
this._pendingBookingRequests = bookingRequests.filter(bookingRequest => bookingRequest.state === 'CREATED');
118118
this._acceptedBookingRequests = bookingRequests.filter(bookingRequest => bookingRequest.state === 'ACCEPTED');
119-
this._getFlavourAvailabilities(bookingRequests
119+
120+
const flavourIds = bookingRequests
120121
.flatMap(bookingRequest => bookingRequest.flavours).map(flavourRequest => flavourRequest.flavour.id)
121-
.filter((value, index, array) => array.indexOf(value) === index));
122+
.filter((value, index, array) => array.indexOf(value) === index);
123+
124+
if (flavourIds.length > 0) {
125+
this._getFlavourAvailabilities(flavourIds);
126+
}
122127
});
123128
}
124129

0 commit comments

Comments
 (0)