review fixes

Author: joonatank

apps/ui/components/calendar/ReservationCalendarControls.tsx

@@ -420,11 +420,7 @@ function ReservationCalendarControls({
               {mode === "edit" && (
                 <SelectButton
                   onClick={() => {
-                    /* FIXME setValue doesn't work for some reason
-                     * controllers do work
-                     * */
-                    const value = !areControlsVisible;
-                    setValue("isControlsVisible", value, {
+                    setValue("isControlsVisible", !areControlsVisible, {
                       shouldDirty: true,
                       shouldValidate: true,
                       shouldTouch: true,

apps/ui/components/reservation-unit/utils.ts

@@ -121,7 +121,10 @@ export function getNextAvailableTime(props: AvailableTimesProps): Date | null {
   const { reservationsMinDaysBefore, reservationsMaxDaysBefore } =
     reservationUnit;
 
-  const today = addDays(new Date(), reservationsMinDaysBefore ?? 0);
+  const minReservationDate = addDays(
+    new Date(),
+    reservationsMinDaysBefore ?? 0
+  );
   const possibleEndDay = getLastPossibleReservationDate(reservationUnit);
   const endDay = possibleEndDay ? addDays(possibleEndDay, 1) : undefined;
   // NOTE there is still a case where application rounds have a hole but there are no reservable times
@@ -134,7 +137,7 @@ export function getNextAvailableTime(props: AvailableTimesProps): Date | null {
     }
     const end = new Date(round.reservationPeriodEnd);
     const begin = new Date(round.reservationPeriodBegin);
-    if (isBefore(end, today)) {
+    if (isBefore(end, minReservationDate)) {
       return acc;
     }
     if (acc == null) {
@@ -146,7 +149,8 @@ export function getNextAvailableTime(props: AvailableTimesProps): Date | null {
     }
     return dayMax([acc, new Date(round.reservationPeriodEnd)]);
   }, undefined);
-  const minDay = dayMax([today, start, openAfterRound]) ?? today;
+  const minDay =
+    dayMax([minReservationDate, start, openAfterRound]) ?? minReservationDate;
 
   // Find the first possible day
   let openTimes = reservableTimes.get(dateToKey(minDay));

apps/ui/components/reservation/EditStep0.tsx

@@ -349,8 +349,6 @@ export function EditStep0({
     }
   };
 
-  // TODO skip length check is weird, why was it needed here?
-  // it allows selecting too long reservations and disables the next button
   const handleCalendarEventChange = useCallback(
     ({ start, end }: CalendarEvent<ReservationNode>): boolean => {
       const { start: newStart, end: newEnd } =

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

@@ -11,7 +11,6 @@ import {
   type RoundPeriod,
   generateReservableMap,
   isRangeReservable,
-  getDayIntervals,
   isStartTimeValid,
 } from "../reservable";
 import {
@@ -752,111 +751,3 @@ describe("isRangeReservable", () => {
     expect(isRangeReservable(input)).toBe(true);
   });
 });
-
-describe("getDayIntervals", () => {
-  test("getDayIntervals from 9 to 17 with 30 min interval", () => {
-    const input = {
-      startTime: { h: 9, m: 0 },
-      endTime: { h: 17, m: 0 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 9; i < 17; i++) {
-      output.push({ h: i, m: 0 });
-      output.push({ h: i, m: 30 });
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-  test("getDayIntervals from 9 to 17 with 15 min interval", () => {
-    const input = {
-      startTime: { h: 9, m: 0 },
-      endTime: { h: 17, m: 0 },
-      interval: ReservationStartInterval.Interval_15Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 9; i < 17; i++) {
-      output.push({ h: i, m: 0 });
-      output.push({ h: i, m: 15 });
-      output.push({ h: i, m: 30 });
-      output.push({ h: i, m: 45 });
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-  test("getDayIntervals from 9 to 17 with 60 min interval", () => {
-    const input = {
-      startTime: { h: 9, m: 0 },
-      endTime: { h: 17, m: 0 },
-      interval: ReservationStartInterval.Interval_60Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 9; i < 17; i++) {
-      output.push({ h: i, m: 0 });
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-  test("getDayIntervals from 0 to 24 with 30 min interval", () => {
-    const input = {
-      startTime: { h: 0, m: 0 },
-      endTime: { h: 24, m: 0 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 0; i < 24; i++) {
-      output.push({ h: i, m: 0 });
-      output.push({ h: i, m: 30 });
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-  test("getDayIntervals with invalid range", () => {
-    const input = {
-      startTime: { h: 17, m: 0 },
-      endTime: { h: 9, m: 0 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual([]);
-  });
-  test("getDayIntervals with 0 size range", () => {
-    const input = {
-      startTime: { h: 17, m: 0 },
-      endTime: { h: 17, m: 0 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual([]);
-  });
-  test("getDayIntervals with uneven times", () => {
-    const input = {
-      startTime: { h: 9, m: 20 },
-      endTime: { h: 17, m: 20 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 9; i < 17; i++) {
-      output.push({ h: i, m: 20 });
-      output.push({ h: i, m: 50 });
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-  test("getDayIntervals with uneven times", () => {
-    const input = {
-      startTime: { h: 9, m: 20 },
-      endTime: { h: 17, m: 0 },
-      interval: ReservationStartInterval.Interval_30Mins,
-    };
-    const output: { h: number; m: number }[] = [];
-    for (let i = 9; i < 17; i++) {
-      output.push({ h: i, m: 20 });
-      if (i < 16) {
-        output.push({ h: i, m: 50 });
-      }
-    }
-    const res = getDayIntervals(input.startTime, input.endTime, input.interval);
-    expect(res).toEqual(output);
-  });
-});