From bd26fadd315e8e95692d6c13341056fd68bf87fc Mon Sep 17 00:00:00 2001
From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it>
Date: Sun, 20 Jun 2021 17:14:36 +0200
Subject: [PATCH] Rename InsertReservationType into ReservationType.
---
src/api/getReservationsList.ts | 6 +++---
src/api/setReservation.ts | 4 ++--
.../Dashboard/ReservationPage/Reservation/Reservation.tsx | 4 ++--
.../Dashboard/ReservationPage/Reservation/TripStage.tsx | 4 ++--
.../Dashboard/ReservationPage/ReservationDialog.tsx | 8 ++++----
src/hooks/useReservations.ts | 8 +++-----
.../{InsertReservationType.ts => ReservationType.ts} | 2 +-
7 files changed, 17 insertions(+), 19 deletions(-)
rename src/types/{InsertReservationType.ts => ReservationType.ts} (81%)
diff --git a/src/api/getReservationsList.ts b/src/api/getReservationsList.ts
index a5739f8..51ff935 100644
--- a/src/api/getReservationsList.ts
+++ b/src/api/getReservationsList.ts
@@ -1,5 +1,5 @@
import axios from 'axios';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
-export const getReservationsList = async (): Promise<InsertReservationType[]> =>
- axios(`/api/web/reservations/`).then((res) => res.data);
+export const getReservationsList = async (): Promise<ReservationType[]> =>
+ axios(`/api/web/reservations/?field=trip_stages`).then((res) => res.data);
diff --git a/src/api/setReservation.ts b/src/api/setReservation.ts
index b7ef9f3..e8c2e61 100644
--- a/src/api/setReservation.ts
+++ b/src/api/setReservation.ts
@@ -1,6 +1,6 @@
import axios from 'axios';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
export const setReservation = async (
- reservation: InsertReservationType,
+ reservation: ReservationType,
): Promise<void> => axios.post('/api/web/reservations/', reservation);
diff --git a/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx b/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx
index 62a9682..9c39f7f 100644
--- a/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx
+++ b/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx
@@ -10,7 +10,7 @@ import {
TableHead,
TableRow,
} from '@material-ui/core';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
const useStyles = makeStyles(() => ({
noShadow: {
@@ -21,7 +21,7 @@ const useStyles = makeStyles(() => ({
}));
type PropsType = {
- reservation: InsertReservationType;
+ reservation: ReservationType;
};
export const Reservation: FC<PropsType> = ({ reservation }: PropsType) => {
diff --git a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
index 297aeb5..71772e5 100644
--- a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
+++ b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
@@ -10,7 +10,7 @@ import {
} from '@material-ui/core';
import { Control, Controller } from 'react-hook-form';
import { InputField } from 'components/Auth/InputField/InputField';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
import DateFnsUtils from '@date-io/date-fns';
import {
MuiPickersUtilsProvider,
@@ -18,7 +18,7 @@ import {
} from '@material-ui/pickers';
type TripStageProps = {
- control: Control<InsertReservationType>;
+ control: Control<ReservationType>;
};
export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
diff --git a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
index 5938e3f..ba5914d 100644
--- a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
+++ b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
@@ -9,7 +9,7 @@ import {
Button,
Typography,
} from '@material-ui/core';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
import { SeniorSearchQueryType } from 'types/SeniorSearchQueryType';
import { getRoleObject } from 'api/getRoleObject';
import { setReservation } from 'api/setReservation';
@@ -25,14 +25,14 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
handleClose,
isOpen,
}: ReservationDialogProps) => {
- const { control, handleSubmit } = useForm<InsertReservationType>({
+ const { control, handleSubmit } = useForm<ReservationType>({
mode: 'onSubmit',
});
const [senior, setSenior] = useState<SeniorSearchQueryType | null>(null);
- const onSubmit: SubmitHandler<InsertReservationType> = (
- reservation: InsertReservationType,
+ const onSubmit: SubmitHandler<ReservationType> = (
+ reservation: ReservationType,
) => {
const filledReservation = reservation;
getRoleObject().then((role) => {
diff --git a/src/hooks/useReservations.ts b/src/hooks/useReservations.ts
index 32fa622..bf7fad3 100644
--- a/src/hooks/useReservations.ts
+++ b/src/hooks/useReservations.ts
@@ -1,11 +1,9 @@
import { getReservationsList } from 'api/getReservationsList';
import { useMemo, useState } from 'react';
-import { InsertReservationType } from 'types/InsertReservationType';
+import { ReservationType } from 'types/ReservationType';
-export const useReservations = (): InsertReservationType[] => {
- const [reservationList, setReservationList] = useState<
- InsertReservationType[]
- >([]);
+export const useReservations = (): ReservationType[] => {
+ const [reservationList, setReservationList] = useState<ReservationType[]>([]);
useMemo(() => {
let isMounted = true;
diff --git a/src/types/InsertReservationType.ts b/src/types/ReservationType.ts
similarity index 81%
rename from src/types/InsertReservationType.ts
rename to src/types/ReservationType.ts
index d2713df..7af9074 100644
--- a/src/types/InsertReservationType.ts
+++ b/src/types/ReservationType.ts
@@ -1,6 +1,6 @@
import { TripStageType } from './TripStageType';
-export type InsertReservationType = {
+export type ReservationType = {
senior: number | undefined;
insertedBy: number;
tripStages: TripStageType[];
--
GitLab