TILA-2626: Fix: don't check collisions for Blocked (#698)

Author: joonatank

admin-ui/src/component/my-units/create-reservation/CreateReservationModal.tsx

@@ -3,10 +3,11 @@ import { useForm, FormProvider, UseFormReturn } from "react-hook-form";
 import { Button, Dialog, Notification } from "hds-react";
 import { useTranslation } from "react-i18next";
 import { useMutation } from "@apollo/client";
-import type {
-  ReservationStaffCreateMutationInput,
-  ReservationStaffCreateMutationPayload,
-  ReservationUnitType,
+import {
+  type ReservationStaffCreateMutationInput,
+  type ReservationStaffCreateMutationPayload,
+  type ReservationUnitType,
+  ReservationsReservationTypeChoices,
 } from "common/types/gql-types";
 import styled from "styled-components";
 import { camelCase, get } from "lodash";
@@ -121,6 +122,10 @@ const useCheckFormCollisions = ({
       before: bufferBeforeSeconds,
       after: bufferAfterSeconds,
     },
+    reservationType:
+      ReservationsReservationTypeChoices[
+        type as keyof typeof ReservationsReservationTypeChoices
+      ],
   });
 
   return { hasCollisions };

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

@@ -241,6 +241,8 @@ const DialogContent = ({ reservation, onAccept, onClose }: Props) => {
           ? reservation.bufferTimeAfter
           : 0,
     },
+    reservationType:
+      reservation.type ?? ReservationsReservationTypeChoices.Staff,
   });
 
   // NOTE 0 => buffer disabled for this reservation, undefined => no buffers selected

admin-ui/src/component/reservations/requested/hooks/useCheckCollisions.ts

@@ -14,6 +14,7 @@ const useCheckCollisions = ({
   start,
   end,
   buffers,
+  reservationType,
 }: {
   reservationPk?: number;
   reservationUnitPk: number;
@@ -23,6 +24,7 @@ const useCheckCollisions = ({
     before: number;
     after: number;
   };
+  reservationType: ReservationsReservationTypeChoices;
 }) => {
   const { notifyError } = useNotification();
 
@@ -69,11 +71,15 @@ const useCheckCollisions = ({
                   end: new Date(x.end),
                   buffers: {
                     before:
+                      reservationType !==
+                        ReservationsReservationTypeChoices.Blocked &&
                       x.type !== ReservationsReservationTypeChoices.Blocked &&
                       x.bufferTimeBefore
                         ? x.bufferTimeBefore
                         : 0,
                     after:
+                      reservationType !==
+                        ReservationsReservationTypeChoices.Blocked &&
                       x.type !== ReservationsReservationTypeChoices.Blocked &&
                       x.bufferTimeAfter
                         ? x.bufferTimeAfter