@sabstravtech/obtservices 0.2.2504251220 → 0.2.2505201645

package/fesm2015/sabstravtech-obtservices-base.js

@@ -1,5 +1,5 @@
 import { __awaiter, __decorate, __metadata } from 'tslib';
-import { BehaviorSubject, of, combineLatest, Subject, firstValueFrom, forkJoin, lastValueFrom, Subscription } from 'rxjs';
+import { BehaviorSubject, of, combineLatest, Subject, forkJoin, Subscription } from 'rxjs';
 import { take, map, catchError, debounceTime, distinctUntilChanged, switchMap, tap, takeUntil } from 'rxjs/operators';
 import moment from 'moment';
 import _, { uniq } from 'lodash';
@@ -8373,7 +8373,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             const term = location.buildingName.replace(/^[^,]+,\s*/, "");
             const isTrueSubject = new BehaviorSubject(true);
             if (location.terminal) { // airport type
-                const locations = yield firstValueFrom(this.searchService.getAirportLocations(term, location.countryCode, isTrueSubject));
+                const locations = yield this.searchService.getAirportLocations(term, location.countryCode, isTrueSubject).toPromise();
                 if (locations === null || locations === void 0 ? void 0 : locations.length) {
                     const { airport, name, type } = locations[0];
                     return {
@@ -8388,7 +8388,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                 }
             }
             else if (location.buildingName === location.streetAndNumber) { // Train St. type
-                const locations = yield firstValueFrom(this.searchService.getStationLocations(term, isTrueSubject));
+                const locations = yield this.searchService.getStationLocations(term, isTrueSubject).toPromise();
                 if (locations === null || locations === void 0 ? void 0 : locations.length) {
                     const { name, railstation, type } = locations[0];
                     return {
@@ -24434,8 +24434,12 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             if (this.applyRailcards) {
                 this.railCards = query.railCardQualifiers;
             }
+            // const fetchRailStation = async (locationId: string): Promise<{ name: string; railstation: RailStation }> => {
+            //   const station = await firstValueFrom(this.searchService.getRailStationById(locationId));
+            //   return { name: station.name, railstation: station };
+            // };
             const fetchRailStation = (locationId) => __awaiter(this, void 0, void 0, function* () {
-                const station = yield firstValueFrom(this.searchService.getRailStationById(locationId));
+                const station = yield this.searchService.getRailStationById(locationId).toPromise();
                 return { name: station.name, railstation: station };
             });
             const resiN = yield fetchRailStation(query.arrivalLocationId);
@@ -28778,7 +28782,7 @@ class BaseEnterpriseBasketService {
             for (const basket of this.currentBaskets) {
                 const basketValue = basket.subject.value;
                 if (basketValue.invokedUser) {
-                    yield firstValueFrom(this.removeBasket(basketValue.id));
+                    yield this.removeBasket(basketValue.id).toPromise();
                 }
             }
         });
@@ -29090,7 +29094,6 @@ class BaseEnterpriseBasketService {
         return __awaiter(this, void 0, void 0, function* () {
             this.removingFromBasket.next(true);
             let intBasket = this.findBasket(basketId);
-            // if it's a hotel remove all linked items
             if (((_a = item === null || item === void 0 ? void 0 : item.service) === null || _a === void 0 ? void 0 : _a.type) === ServiceType.Hotel) {
                 const hotelItems = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value.basketItems.filter((basketItem) => {
                     return (item.detail.hotelId === basketItem.detail.hotelId &&
@@ -29099,15 +29102,17 @@ class BaseEnterpriseBasketService {
                         item.detail.rooms[0].checkOut === basketItem.detail.rooms[0].checkOut);
                 });
                 if ((hotelItems === null || hotelItems === void 0 ? void 0 : hotelItems.length) > 1) {
-                    // ENT-2447 new modal made in LU, needs to be made in all obts and app or will get error
                     yield this.modalService.open(ModalTypes.WarningRemoveModalComponent, {
                         backdrop: 'static'
                     });
                     for (const item of hotelItems) {
-                        const newBasket = yield lastValueFrom(this.removeItemFromBasketUpdater.updateOne({
+                        const newBasket = yield this.removeItemFromBasketUpdater
+                            .updateOne({
                             convertCurrencyTo: this.userCurrency,
                             basketItem: item.id
-                        }));
+                        })
+                            .pipe(take(1))
+                            .toPromise();
                         if (newBasket) {
                             this.miViewed = false;
                             intBasket === null || intBasket === void 0 ? void 0 : intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
@@ -29117,10 +29122,13 @@ class BaseEnterpriseBasketService {
                     }
                 }
                 else {
-                    const newBasket = yield lastValueFrom(this.removeItemFromBasketUpdater.updateOne({
+                    const newBasket = yield this.removeItemFromBasketUpdater
+                        .updateOne({
                         convertCurrencyTo: this.userCurrency,
                         basketItem: item.id
-                    }));
+                    })
+                        .pipe(take(1))
+                        .toPromise();
                     if (newBasket) {
                         this.miViewed = false;
                         intBasket === null || intBasket === void 0 ? void 0 : intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
@@ -29130,10 +29138,13 @@ class BaseEnterpriseBasketService {
                 }
             }
             else {
-                const newBasket = yield lastValueFrom(this.removeItemFromBasketUpdater.updateOne({
+                const newBasket = yield this.removeItemFromBasketUpdater
+                    .updateOne({
                     convertCurrencyTo: this.userCurrency,
                     basketItem: item.id
-                }));
+                })
+                    .pipe(take(1))
+                    .toPromise();
                 if (newBasket) {
                     this.miViewed = false;
                     intBasket === null || intBasket === void 0 ? void 0 : intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
@@ -29527,10 +29538,19 @@ class BaseEnterpriseBasketService {
             this.validateBasketItemMiFetcher.fetchOne(query);
         });
     }
+    // async validateMiBasket(basketId: string): Promise<void> {
+    //   const query = { basketId };
+    //   return firstValueFrom(this.validateBasketMiFetcher.fetchOne(query)).then(data => {
+    //     this.miViewed = true;
+    //     this.missingMIs = data;
+    //   });
+    // }
     validateMiBasket(basketId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = { basketId };
-            return firstValueFrom(this.validateBasketMiFetcher.fetchOne(query)).then(data => {
+            const query = {
+                basketId
+            };
+            this.validateBasketMiFetcher.fetchOne(query).subscribe(data => {
                 this.miViewed = true;
                 this.missingMIs = data;
             });