Fixed some types in front

WildCodeSchool · Dec 12, 2024 · 1829478 · 1829478
1 parent 79ad020
commit 1829478
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/frontend/src/components/ReservationCard.tsx b/frontend/src/components/ReservationCard.tsx
@@ -2,13 +2,17 @@ import { Card, Divider } from "antd";
 import ValidateReservationButton from "./ValidateReservationButton";
 import { ReservationData } from "../interface/types";
 
-export const ReservationCard = ( {reservationData} : {reservationData: ReservationData}) => {
-  const formattedStartDate = new Date(reservationData.reservation.startDate).toLocaleDateString(
-    "fr-FR"
-  );
-  const formattedEndDate = new Date(reservationData.reservation.endDate).toLocaleDateString(
-    "fr-FR"
-  );
+export const ReservationCard = ({
+  reservationData,
+}: {
+  reservationData: ReservationData;
+}) => {
+  const formattedStartDate = new Date(
+    reservationData.reservation.startDate
+  ).toLocaleDateString("fr-FR");
+  const formattedEndDate = new Date(
+    reservationData.reservation.endDate
+  ).toLocaleDateString("fr-FR");
   const reservationId = reservationData.reservation.id;
   return (
     <>
@@ -19,7 +23,9 @@ export const ReservationCard = ( {reservationData} : {reservationData: Reservati
         <p>Prix : {reservationData.totalPrice} euros</p>
         <p>Status : {reservationData.reservation.status}</p>
         {reservationData.reservation.status === "pending" && (
-          <ValidateReservationButton reservation={reservationData.reservation} />
+          <ValidateReservationButton
+            reservation={reservationData.reservation}
+          />
         )}
       </Card>
       <Divider dashed />

diff --git a/frontend/src/components/ValidateReservationButton.tsx b/frontend/src/components/ValidateReservationButton.tsx
@@ -7,7 +7,13 @@ import {
   GetReservationsByUserIdDocument,
 } from "../generated/graphql-types";
 
-function ValidateReservationButton({ reservation }: Reservation) {
+type ValidateReservationButtonProps = {
+  reservation: Reservation;
+};
+
+const ValidateReservationButton = ({
+  reservation,
+}: ValidateReservationButtonProps) => {
   const [updateReservationStatus] = useMutation(UPDATE_RESERVATION_STATUS, {
     onCompleted: () => {
       message.success("La réservation a bien été validée.");
@@ -40,6 +46,6 @@ function ValidateReservationButton({ reservation }: Reservation) {
       </Popconfirm>
     </>
   );
-}
+};
 
 export default ValidateReservationButton;
diff --git a/frontend/src/interface/types.tsx b/frontend/src/interface/types.tsx
@@ -61,20 +61,19 @@ export interface NewProductFormValues {
 export type Article = {
   id: number;
   product?: ProductCard;
-  reservations?: Reservation[] | null
+  reservations?: Reservation[] | null;
 };
 
 export type Reservation = {
-  reservation: {
-    id: number;
-    startDate: string;
-    endDate: string;
-    articles: Article[];
-    status: string;
-    createdAt?: string;
-  };
+  id: number;
+  startDate: string;
+  endDate: string;
+  articles: Article[];
+  status: string;
+  createdAt?: string;
 };
 
-export type ReservationData = Reservation & {
+export type ReservationData = {
+  reservation: Reservation;
   totalPrice?: number;
 };