Merge branch 'fix/api' into 'dev'

Fix/api

See merge request !66

src/components/Dashboard/ReservationPage/Reservation/InsertReservationProps.ts

-export type LocationType = {
-  address: string;
-};
-
-export type TripStageType = {
-  location: Location;
-  number: number;
-  estimatedBeAt: Date;
-};
-
-export type InsertReservationProps = {
-  senior: number | undefined;
-  insertedBy: number;
-  tripStages: TripStageType[];
-  driverShift: string | null;
-  estimatedBeAt: Date;
-};

src/components/Dashboard/ReservationPage/Reservation/SeniorSearch/SeniorSearch.tsx

@@ -3,19 +3,19 @@ import React, { FC, useEffect, useState } from 'react';
 import TextField from '@material-ui/core/TextField';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { getSeniorList } from 'api/getSeniorList';
-import { ResponseProps } from 'api/ResponseProps';
+import { SeniorSearchQueryType } from 'types/SeniorSearchQueryType';
 import { getSeniorListByCard } from 'api/getSeniorListByCard';
 
 type SeniorSearchProps = {
-  senior: ResponseProps | null;
-  setSenior: React.Dispatch<React.SetStateAction<ResponseProps | null>>;
+  senior: SeniorSearchQueryType | null;
+  setSenior: React.Dispatch<React.SetStateAction<SeniorSearchQueryType | null>>;
 };
 
 export const SeniorSearch: FC<SeniorSearchProps> = ({
   senior,
   setSenior,
 }: SeniorSearchProps) => {
-  const [seniors, setSeniors] = useState<ResponseProps[]>([]);
+  const [seniors, setSeniors] = useState<SeniorSearchQueryType[]>([]);
   const [query, setQuery] = useState<string>('');
 
   useEffect(() => {

src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx

@@ -3,20 +3,12 @@ import React, { FC, useState } from 'react';
 import { Button, TextField, Typography } from '@material-ui/core';
 import { Control, Controller } from 'react-hook-form';
 import { InputField } from 'components/Auth/InputField/InputField';
-import {
-  InsertReservationProps,
-  TripStageType,
-} from './InsertReservationProps';
+import { InsertReservationType } from 'types/InsertReservationType';
 
 type TripStageProps = {
-  control: Control<InsertReservationProps>;
+  control: Control<InsertReservationType>;
 };
 
-// FIX: Data is flushed onChange. Similar problem in seniorSearch.
-// What about this https://codesandbox.io/s/usefieldarray-wfbjt?file=/src/index.js
-// Usefields.
-// https://codesandbox.io/s/usefieldarray-virtual-input-v9wyw
-// https://codesandbox.io/s/react-hook-form-usefieldarray-7bpmk
 export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
   const [stage, setStage] = useState<string[]>(['']);
   const [value, setValue] = useState<string>('');

src/components/Dashboard/ReservationPage/ReservationDialog.tsx

@@ -9,15 +9,13 @@ import {
   Button,
   Typography,
 } from '@material-ui/core';
-
-import { ResponseProps } from 'api/ResponseProps';
+import { InsertReservationType } from 'types/InsertReservationType';
+import { SeniorSearchQueryType } from 'types/SeniorSearchQueryType';
 import { getRoleObject } from 'api/getRoleObject';
 import { setReservation } from 'api/setReservation';
 import { SubmitHandler, useForm } from 'react-hook-form';
-import { InputField } from 'components/Auth/InputField/InputField';
-import { InsertReservationProps } from './Reservation/InsertReservationProps';
-import { TripStage } from './Reservation/TripStage';
 import { SeniorSearch } from './Reservation/SeniorSearch/SeniorSearch';
+import { TripStage } from './Reservation/TripStage';
 
 type ReservationDialogProps = {
   handleClose: () => void;
@@ -27,14 +25,14 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
   handleClose,
   isOpen,
 }: ReservationDialogProps) => {
-  const { control, handleSubmit } = useForm<InsertReservationProps>({
+  const { control, handleSubmit } = useForm<InsertReservationType>({
     mode: 'onSubmit',
   });
 
-  const [senior, setSenior] = useState<ResponseProps | null>(null);
+  const [senior, setSenior] = useState<SeniorSearchQueryType | null>(null);
 
-  const onSubmit: SubmitHandler<InsertReservationProps> = (
-    reservation: InsertReservationProps,
+  const onSubmit: SubmitHandler<InsertReservationType> = (
+    reservation: InsertReservationType,
   ) => {
     const filledReservation = reservation;
     getRoleObject().then((role) => {

src/types/ReservationType.ts

-export {};