Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Commit 53083e3

Browse files
committed
fix: graphql key errors from api change
1 parent 19c272f commit 53083e3

3 files changed

Lines changed: 12 additions & 17 deletions

File tree

apps/ui/modules/__tests__/reservation.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function createMockReservation({
118118
paymentOrder: [],
119119
begin: start.toISOString(),
120120
end: end.toISOString(),
121-
reservationUnit: [reservationUnit ?? createMockReservationUnit({})],
121+
reservationUnits: [reservationUnit ?? createMockReservationUnit({})],
122122
handlingDetails: "",
123123
isHandled,
124124
};

apps/ui/modules/reservation.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,13 @@ type IsWithinCancellationPeriodReservationT = Pick<
119119
ReservationNodeT,
120120
"begin"
121121
> & {
122-
reservationUnit?: Array<{
123-
cancellationRule?: Pick<
124-
NonNullable<ReservationUnitNode["cancellationRule"]>,
125-
"canBeCancelledTimeBefore" | "needsHandling"
126-
> | null;
127-
}> | null;
122+
reservationUnits?: Maybe<Array<CancellationRuleFieldsFragment>> | undefined;
128123
};
129124

130125
function isTooCloseToCancel(
131126
reservation: IsWithinCancellationPeriodReservationT
132127
): boolean {
133-
const reservationUnit = reservation.reservationUnit?.[0];
128+
const reservationUnit = reservation.reservationUnits?.[0];
134129
const begin = new Date(reservation.begin);
135130

136131
const { canBeCancelledTimeBefore } = reservationUnit?.cancellationRule ?? {};
@@ -144,12 +139,12 @@ type CanUserCancelReservationProps = Pick<
144139
NonNullable<ReservationNodeT>,
145140
"state" | "begin"
146141
> & {
147-
reservationUnit?: Maybe<Array<CancellationRuleFieldsFragment>> | undefined;
142+
reservationUnits?: Maybe<Array<CancellationRuleFieldsFragment>> | undefined;
148143
};
149144
export function isReservationCancellable(
150145
reservation: CanUserCancelReservationProps
151146
): boolean {
152-
const reservationUnit = reservation.reservationUnit?.[0];
147+
const reservationUnit = reservation.reservationUnits?.[0];
153148
const isReservationCancelled =
154149
reservation.state === ReservationStateChoice.Cancelled;
155150
const isBeingHandled =
@@ -278,7 +273,7 @@ export function getWhyReservationCantBeChanged(
278273
return "RESERVATION_BEGIN_IN_PAST";
279274
}
280275

281-
const reservationUnit = reservation.reservationUnit?.[0];
276+
const reservationUnit = reservation.reservationUnits?.[0];
282277
if (
283278
reservationUnit?.cancellationRule == null ||
284279
reservationUnit.cancellationRule.needsHandling

apps/ui/pages/reservations/[id]/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -382,20 +382,20 @@ function Reservation({
382382
}, [reservation, reservationUnit]);
383383

384384
const paymentTermsContent =
385-
reservationUnit?.paymentTerms != null
386-
? getTranslation(reservationUnit?.paymentTerms, "text")
385+
reservationUnit.paymentTerms != null
386+
? getTranslation(reservationUnit.paymentTerms, "text")
387387
: undefined;
388388
const cancellationTermsContent =
389-
reservationUnit?.cancellationTerms != null
390-
? getTranslation(reservationUnit?.cancellationTerms, "text")
389+
reservationUnit.cancellationTerms != null
390+
? getTranslation(reservationUnit.cancellationTerms, "text")
391391
: undefined;
392392
const pricingTermsContent =
393393
reservationUnit?.pricingTerms != null
394394
? getTranslation(reservationUnit?.pricingTerms, "text")
395395
: undefined;
396396
const serviceSpecificTermsContent =
397-
reservationUnit?.serviceSpecificTerms != null
398-
? getTranslation(reservationUnit?.serviceSpecificTerms, "text")
397+
reservationUnit.serviceSpecificTerms != null
398+
? getTranslation(reservationUnit.serviceSpecificTerms, "text")
399399
: undefined;
400400

401401
const modifyTimeReason = getWhyReservationCantBeChanged({ reservation });

0 commit comments

Comments
 (0)