fix: backend graphql API changes

Author: joonatank

apps/admin-ui/gql/gql-types.ts

@@ -44,7 +44,7 @@ export const SPACE_FRAGMENT = gql`
   fragment SpaceFields on SpaceNode {
     ...SpaceCommonFields
     code
-    resourceSet {
+    resources {
       ...ResourceFields
     }
     children {
@@ -177,7 +177,7 @@ export const RESERVATIONUNIT_RESERVATIONS_FRAGMENT = gql`
     name
     numPersons
     calendarUrl
-    reservationUnit {
+    reservationUnits {
       id
       pk
       nameFi

apps/admin-ui/src/common/fragments.tsx

@@ -22,7 +22,7 @@ export const UNIT_QUERY = gql`
       nameFi
       tprekId
       shortDescriptionFi
-      reservationunitSet {
+      reservationUnits {
         ...ReservationUnitCommonFields
         resources {
           id
@@ -60,7 +60,7 @@ export const UNIT_WITH_SPACES_AND_RESOURCES = gql`
       nameFi
       spaces {
         ...SpaceCommonFields
-        resourceSet {
+        resources {
           id
           pk
           nameFi

apps/admin-ui/src/common/queries.tsx

@@ -126,7 +126,7 @@ export const CHANGE_RESERVATION_TIME_QUERY_FRAGMENT = gql`
       beginDate
       endDate
     }
-    reservationUnit {
+    reservationUnits {
       id
       pk
       bufferTimeBefore
@@ -316,7 +316,7 @@ export function NewReservationModal({
 
   const { recurringReservation, type } = reservationToCopy ?? {};
   const { pk: recurringReservationPk } = recurringReservation ?? {};
-  const reservationUnit = reservationToCopy?.reservationUnit?.[0];
+  const reservationUnit = reservationToCopy?.reservationUnits?.[0];
 
   // NOTE 0 => buffer disabled for this reservation, undefined => no buffers selected
   const bufferTimeBefore = reservationUnit?.bufferTimeBefore ?? 0;
@@ -455,7 +455,7 @@ export function EditTimeModal({
   const startDateTime = new Date(reservation.begin);
   const endDateTime = new Date(reservation.end);
 
-  const reservationUnit = reservation.reservationUnit?.find(() => true);
+  const reservationUnit = reservation.reservationUnits?.find(() => true);
 
   // NOTE 0 => buffer disabled for this reservation, undefined => no buffers selected
   const bufferTimeBefore =
@@ -525,7 +525,7 @@ export function EditTimeModal({
       <ErrorBoundary fallback={<div>{t("errors.descriptive.unknown")}</div>}>
         <DialogContent
           form={form}
-          reservationUnitPk={reservation.reservationUnit?.[0]?.pk ?? 0}
+          reservationUnitPk={reservation.reservationUnits?.[0]?.pk ?? 0}
           bufferTimeAfter={bufferTimeAfter}
           bufferTimeBefore={bufferTimeBefore}
           mutate={changeTime}

apps/admin-ui/src/component/EditTimeModal.tsx

@@ -59,7 +59,7 @@ export function RecurringReservationsView({
   });
 
   const { hasPermission } = useCheckPermission({
-    units: [reservationToCopy?.reservationUnit?.[0].unit?.pk ?? 0],
+    units: [reservationToCopy?.reservationUnits?.[0].unit?.pk ?? 0],
     permission: UserPermissionChoice.CanManageReservations,
   });
 

apps/admin-ui/src/component/RecurringReservationsView.tsx

@@ -23,7 +23,7 @@ import { Element } from "@/styles/util";
 // TODO use a fragment
 type ReservationType = NonNullable<ReservationQuery["reservation"]>;
 type ReservationUnitType = Omit<
-  NonNullable<ReservationType["reservationUnit"]>[0],
+  NonNullable<ReservationType["reservationUnits"]>[0],
   "pricings"
 >;
 

apps/admin-ui/src/component/ReservationTypeForm.tsx

@@ -156,7 +156,7 @@ function AddNewReservationButton({
   refetch,
 }: AddNewReservationButtonProps) {
   const { hasPermission } = useCheckPermission({
-    units: [reservationToCopy?.reservationUnit?.[0].unit?.pk ?? 0],
+    units: [reservationToCopy?.reservationUnits?.[0].unit?.pk ?? 0],
     permission: UserPermissionChoice.CanManageReservations,
   });
   const { t } = useTranslation();

apps/admin-ui/src/component/ReservationsList.tsx

@@ -8,7 +8,7 @@ import { useSession } from "@/hooks/auth";
 
 type ReservationPermissionType = Pick<
   ReservationUnitReservationsFragment,
-  "reservationUnit" | "user"
+  "reservationUnits" | "user"
 >;
 
 function VisibleIfPermission({
@@ -25,7 +25,7 @@ function VisibleIfPermission({
   const { user } = useSession();
   const isOwner = reservation.user?.pk === user?.pk;
   const { hasPermission } = useCheckPermission({
-    units: [reservation?.reservationUnit?.[0]?.unit?.pk ?? 0],
+    units: [reservation?.reservationUnits?.[0]?.unit?.pk ?? 0],
     permission,
   });
 

apps/admin-ui/src/component/VisibleIfPermission.tsx

@@ -54,9 +54,7 @@ export function useCheckCollisions({
   ) {
     return reservation.affectedReservationUnits?.some((pk) => pk === resUnitPk);
   }
-  const reservationSet = filterNonNullable(
-    data?.reservationUnit?.reservationSet
-  );
+  const reservationSet = filterNonNullable(data?.reservationUnit?.reservations);
   // NOTE we could use a recular concat here (we only have single reservationUnit here)
   const affectingReservations = filterNonNullable(data?.affectingReservations);
   const reservations = filterNonNullable(

apps/admin-ui/src/hooks/useCheckCollisions.ts

@@ -592,14 +592,13 @@ function BasicSection({
   const { errors } = formState;
   const { spaces } = unit ?? {};
 
-  const spaceOptions =
-    spaces?.map((s) => ({
-      label: String(s?.nameFi),
-      value: Number(s?.pk),
-    })) ?? [];
+  const spaceOptions = filterNonNullable(spaces).map((s) => ({
+    label: s?.nameFi ?? "-",
+    value: s?.pk ?? 0,
+  }));
   const resourceOptions = filterNonNullable(
-    spaces?.flatMap((s) => s?.resourceSet)
-  ).map((r) => ({ label: String(r?.nameFi), value: Number(r?.pk) }));
+    spaces?.flatMap((s) => s?.resources)
+  ).map((r) => ({ label: r?.nameFi ?? "-", value: r?.pk ?? 0 }));
 
   const spacePks = watch("spaces");
   const selectedSpaces = filterNonNullable(