refactor: remove more unused code

Author: joonatank

apps/admin-ui/nginx/nginx.conf

@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { useTranslation } from "react-i18next";
 import { Button } from "hds-react";
 
-type NewReservationListItem = {
+export type NewReservationListItem = {
   date: Date;
   startTime: string;
   endTime: string;
@@ -140,13 +140,15 @@ const StatusElement = ({ item }: { item: NewReservationListItem }) => {
   );
 };
 
-const ReservationList = ({
+/// Used by the RecurringReservation pages to show a list of reservations
+/// TODO should be renamed / moved to signify that this is only for recurring reservations
+export function ReservationList({
   header,
   items,
   hasPadding,
   onLoadMore,
   hasMore,
-}: Props) => {
+}: Props) {
   const { t } = useTranslation();
 
   if (!items.length) return null;
@@ -187,7 +189,4 @@ const ReservationList = ({
       </StyledList>
     </ListWrapper>
   );
-};
-
-export default ReservationList;
-export type { NewReservationListItem };
+}

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

@@ -17,8 +17,9 @@ import {
   type RecurringReservationForm,
 } from "@/schemas";
 import { SortedSelect } from "@/component/SortedSelect";
-import ReservationList, {
-  NewReservationListItem,
+import {
+  ReservationList,
+  type NewReservationListItem,
 } from "@/component/ReservationsList";
 import { useNotification } from "@/context/NotificationContext";
 import { ActionsWrapper, Grid, Element } from "./commonStyling";

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

@@ -7,9 +7,9 @@ import { ErrorBoundary } from "react-error-boundary";
 import { z } from "zod";
 import { H1, H6 } from "common/src/common/typography";
 import { breakpoints } from "common/src/common/style";
-import RecurringReservationsView from "app/component/reservations/requested/RecurringReservationsView";
+import RecurringReservationsView from "@/component/reservations/requested/RecurringReservationsView";
 import { ActionsWrapper } from "./commonStyling";
-import ReservationList from "../../ReservationsList";
+import { ReservationList } from "@/component/ReservationsList";
 
 const InfoSection = styled.p`
   margin: var(--spacing-l) 0;

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

@@ -5,7 +5,7 @@ import { addDays, format, nextMonday } from "date-fns";
 import { ReservationStartInterval } from "common/types/gql-types";
 import { toUIDate } from "common/src/common/util";
 import { generateReservations } from "./generateReservations";
-import ReservationList from "../../ReservationsList";
+import { ReservationList } from "../../ReservationsList";
 
 const DATE_FORMAT = "dd.MM.yyyy";
 const today = new Date();

apps/admin-ui/src/component/my-units/MyUnitRecurringReservation/MyUnitRecurringReservationForm.tsx

@@ -1,43 +1,18 @@
 import React from "react";
 import { type ReservationNode, State } from "common/types/gql-types";
 import { useTranslation } from "react-i18next";
-import { addHours, isToday } from "date-fns";
 import { Button } from "hds-react";
 import { ButtonLikeLink } from "@/component/ButtonLikeLink";
 import DenyDialog from "./DenyDialog";
 import ApproveDialog from "./ApproveDialog";
 import ReturnToRequiredHandlingDialog from "./ReturnToRequiresHandlingDialog";
 import { useModal } from "@/context/ModalContext";
-
-/* Rules
- * Approve only if REQUIRES_HANDLING
- * Deny if REQUIRES_HANDLING or CONFIRMED
- * Return to handling if DENIED or CONFIRMED
- * Other states (e.g. WAITING_FOR_PAYMENT) are not allowed to be modified
- *
- * Allowed to change state (except deny unconfirmed) only till it's ended.
- * Allowed to modify the reservation after ending as long as it's the same date or within one hour.
- */
-const isPossibleToApprove = (state: State, end: Date): boolean =>
-  state === State.RequiresHandling && end > new Date();
-
-const isPossibleToDeny = (state: State, end: Date): boolean => {
-  if (state === State.RequiresHandling) {
-    return true;
-  }
-  return state === State.Confirmed && end > new Date();
-};
-
-const isPossibleToReturn = (state: State, end: Date): boolean =>
-  (state === State.Denied || state === State.Confirmed) && end > new Date();
-
-const isPossibleToEdit = (state: State, end: Date): boolean => {
-  if (state !== State.Confirmed) {
-    return false;
-  }
-  const now = new Date();
-  return end > addHours(now, -1) || isToday(end);
-};
+import {
+  isPossibleToApprove,
+  isPossibleToDeny,
+  isPossibleToEdit,
+  isPossibleToReturn,
+} from "./reservationModificationRules";
 
 const ApprovalButtons = ({
   state,

apps/admin-ui/src/component/my-units/MyUnitRecurringReservation/RecurringReservationDone.tsx

@@ -9,8 +9,8 @@ import {
 } from "common/types/gql-types";
 import { type ApolloQueryResult } from "@apollo/client";
 import { useRecurringReservations } from "./hooks";
-import ReservationList from "../../ReservationsList";
-import ReservationListButton from "../../ReservationListButton";
+import { ReservationList } from "@/component/ReservationsList";
+import ReservationListButton from "@/component/ReservationListButton";
 import DenyDialog from "./DenyDialog";
 import { useModal } from "@/context/ModalContext";
 import EditTimeModal from "../EditTimeModal";

apps/admin-ui/src/component/my-units/MyUnitRecurringReservation/ReservationsList.test.tsx

@@ -16,7 +16,7 @@ const Ingress = styled(H2).attrs({ $legacy: true })`
   line-height: 1.8125rem;
 `;
 
-function ApplicationRounds(): JSX.Element {
+function HomePage(): JSX.Element {
   const { t } = useTranslation();
 
   const { user } = usePermission();
@@ -37,4 +37,4 @@ function ApplicationRounds(): JSX.Element {
   );
 }
 
-export default ApplicationRounds;
+export default HomePage;