diff --git a/src/components/Select/Select.tsx b/src/components/Select/Select.tsx index 3dc7836..70b00c4 100644 --- a/src/components/Select/Select.tsx +++ b/src/components/Select/Select.tsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactSelect, { SingleValue } from "react-select"; -interface OptionType { +export interface OptionType { value: string | number; label: string; } @@ -14,7 +14,6 @@ interface SelectProps { name: string; } - export function Select({options, placeholder, value, onChange, name}: SelectProps) { return ( <> diff --git a/src/modals/BodyType.tsx b/src/modals/BodyType.tsx index bdd92ac..552aee0 100644 --- a/src/modals/BodyType.tsx +++ b/src/modals/BodyType.tsx @@ -1,5 +1,5 @@ import {Input} from "@/components/Input/Input"; -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {add, update} from "@/api/bodyTypes"; import {useModalContext} from "@/components/Modal/ModalContext"; @@ -14,7 +14,7 @@ export default function BodyType({ initialData }: any) { name: initialData?.name || "", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/Car.tsx b/src/modals/Car.tsx index c4f2f51..225e09e 100644 --- a/src/modals/Car.tsx +++ b/src/modals/Car.tsx @@ -1,15 +1,16 @@ import Button from "@/components/Button/Button"; import React, {useState} from "react"; -import {useCarModelContext} from "@/api/context/CarModel"; -import {useEngineContext} from "@/api/context/Engine"; -import {useTrimContext} from "@/api/context/Trim"; -import {useBodyTypeContext} from "@/api/context/BodyType"; -import {useCarColorContext} from "@/api/context/CarColor"; -import {useTransmissionContext} from "@/api/context/Transmission"; -import {Select} from "@/components/Select/Select"; +import {CarModelItem, useCarModelContext} from "@/api/context/CarModel"; +import {EngineItem, useEngineContext} from "@/api/context/Engine"; +import {TrimItem, useTrimContext} from "@/api/context/Trim"; +import {BodyTypeItem, useBodyTypeContext} from "@/api/context/BodyType"; +import {CarColorItem, useCarColorContext} from "@/api/context/CarColor"; +import {TransmissionItem, useTransmissionContext} from "@/api/context/Transmission"; +import {OptionType, Select} from "@/components/Select/Select"; import {useModalContext} from "@/components/Modal/ModalContext"; import {add, update} from "@/api/cars"; import {useCarContext} from "@/api/context/Car"; +import {SingleValue} from "react-select"; export default function Car({ initialData }: any) { const { carModel } = useCarModelContext(); @@ -21,32 +22,32 @@ export default function Car({ initialData }: any) { const { fetchData } = useCarContext(); const { setContentModal } = useModalContext(); - const carModelOptions = carModel?.map((model: any) => ({ + const carModelOptions = carModel?.map((model: CarModelItem) => ({ value: model.id, label: model.name })) || []; - const engineOptions = engine?.map((engine: any) => ({ + const engineOptions = engine?.map((engine: EngineItem) => ({ value: engine.id, label: engine.type })) || []; - const trimOptions = trim?.map((trim: any) => ({ + const trimOptions = trim?.map((trim: TrimItem) => ({ value: trim.id, label: trim.name })) || []; - const bodyTypesOptions = bodyTypes?.map((bodyType: any) => ({ + const bodyTypesOptions = bodyTypes?.map((bodyType: BodyTypeItem) => ({ value: bodyType.id, label: bodyType.name })) || []; - const carColorOptions = carColor?.map((color: any) => ({ + const carColorOptions = carColor?.map((color: CarColorItem) => ({ value: color.id, label: color.name })) || []; - const transmissionOptions = transmission?.map((transmission: any) => ({ + const transmissionOptions = transmission?.map((transmission: TransmissionItem) => ({ value: transmission.id, label: transmission.type })) || []; @@ -76,61 +77,55 @@ export default function Car({ initialData }: any) { { - const { value } = e; + onChange={(e: SingleValue) => { setFormData({ ...formData, - engines_id: value + engines_id: e ? e.value : null, }); }} name="engines_id"/> { - const { value } = e; + onChange={(e: SingleValue) => { setFormData({ ...formData, - body_types_id: value + body_types_id: e ? e.value : null, }); }} name="body_types_id"/> { - const { value } = e; + onChange={(e: SingleValue) => { setFormData({ ...formData, - transmissions_id: value + transmissions_id: e ? e.value : null, }); }} name="transmissions_id"/> diff --git a/src/modals/CarBrand.tsx b/src/modals/CarBrand.tsx index 999ff26..616ada1 100644 --- a/src/modals/CarBrand.tsx +++ b/src/modals/CarBrand.tsx @@ -1,5 +1,5 @@ import {Input} from "@/components/Input/Input"; -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {useModalContext} from "@/components/Modal/ModalContext"; import {useCarBrandContext} from "@/api/context/CarBrand"; @@ -15,7 +15,7 @@ export default function CarBrand({ initialData }: any) { country: initialData?.country || "", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/CarColor.tsx b/src/modals/CarColor.tsx index cb7d482..cd5933e 100644 --- a/src/modals/CarColor.tsx +++ b/src/modals/CarColor.tsx @@ -1,4 +1,4 @@ -import { useState } from "react"; +import React, { useState } from "react"; import {InputColor} from "@/components/Input/InputColor"; import {Input} from "@/components/Input/Input"; import Button from "@/components/Button/Button"; @@ -16,7 +16,7 @@ export default function CarColor({ initialData }: any) { hexCode: initialData?.hexCode || "#000000", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/CarModel.tsx b/src/modals/CarModel.tsx index ef3043c..a63cb09 100644 --- a/src/modals/CarModel.tsx +++ b/src/modals/CarModel.tsx @@ -2,10 +2,11 @@ import {Input} from "@/components/Input/Input"; import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {useCarBrandContext} from "@/api/context/CarBrand"; -import {Select} from "@/components/Select/Select"; +import {OptionType, Select} from "@/components/Select/Select"; import {add, update} from "@/api/carModels"; import {useCarModelContext} from "@/api/context/CarModel"; import {useModalContext} from "@/components/Modal/ModalContext"; +import {SingleValue} from "react-select"; export default function CarModel({ initialData }: any) { const { setContentModal } = useModalContext(); @@ -25,7 +26,7 @@ export default function CarModel({ initialData }: any) { car_brands_id: initialData?.car_brands_id || null, }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormDataCarModel({ ...formDataCarModel, @@ -33,11 +34,10 @@ export default function CarModel({ initialData }: any) { }); }; - const handleChangeSelect = (e: any) => { - const { value } = e; + const handleChangeSelect = (e: SingleValue) => { setFormDataCarModel({ ...formDataCarModel, - car_brands_id: value + car_brands_id: e ? e.value : null }); }; diff --git a/src/modals/Customer.tsx b/src/modals/Customer.tsx index 8067e58..78872b5 100644 --- a/src/modals/Customer.tsx +++ b/src/modals/Customer.tsx @@ -1,5 +1,5 @@ import {Input} from "@/components/Input/Input"; -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {useModalContext} from "@/components/Modal/ModalContext"; import {add, update} from "@/api/customers"; @@ -16,7 +16,7 @@ export default function Customer({ initialData }: any) { email: initialData?.email || "", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/Engine.tsx b/src/modals/Engine.tsx index 7194aad..697bf35 100644 --- a/src/modals/Engine.tsx +++ b/src/modals/Engine.tsx @@ -1,5 +1,5 @@ import {Input} from "@/components/Input/Input"; -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {useEngineContext} from "@/api/context/Engine"; import {add, update} from "@/api/engines"; @@ -16,7 +16,7 @@ export default function Engine({ initialData }: any) { volume: initialData?.volume || "", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/Sale.tsx b/src/modals/Sale.tsx index 2eb4310..62f1e09 100644 --- a/src/modals/Sale.tsx +++ b/src/modals/Sale.tsx @@ -1,6 +1,6 @@ import Button from "@/components/Button/Button"; import {useModalContext} from "@/components/Modal/ModalContext"; -import {Select} from "@/components/Select/Select"; +import {OptionType, Select} from "@/components/Select/Select"; import React, {useState} from "react"; import {add, update} from "@/api/sales"; import {useSaleContext} from "@/api/context/Sale"; @@ -8,6 +8,7 @@ import {Input} from "@/components/Input/Input"; import {useCarContext} from "@/api/context/Car"; import {useCustomerContext} from "@/api/context/Customer"; import {InputDate} from "@/components/Input/InputDate"; +import {SingleValue} from "react-select"; export default function Sale({ initialData }:any) { const { setContentModal } = useModalContext(); @@ -34,7 +35,7 @@ export default function Sale({ initialData }:any) { customers_id: initialData?.customers_id || null, }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, @@ -59,21 +60,19 @@ export default function Sale({ initialData }:any) { { - const { value } = e; + onChange={(e: SingleValue) => { setFormData({ ...formData, - customers_id: value + customers_id: e ? e.value : null }); }} name="customers_id"/> diff --git a/src/modals/Transmission.tsx b/src/modals/Transmission.tsx index 218aaf0..c4edd45 100644 --- a/src/modals/Transmission.tsx +++ b/src/modals/Transmission.tsx @@ -1,5 +1,5 @@ import {Input} from "@/components/Input/Input"; -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button/Button"; import {add, update} from "@/api/transmissions"; import {useModalContext} from "@/components/Modal/ModalContext"; @@ -14,7 +14,7 @@ export default function Transmission({ initialData }: any) { type: initialData?.type || "", }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, diff --git a/src/modals/Trim.tsx b/src/modals/Trim.tsx index 59d2fe3..5fc656e 100644 --- a/src/modals/Trim.tsx +++ b/src/modals/Trim.tsx @@ -1,11 +1,12 @@ import {Input} from "@/components/Input/Input"; import React, {useState} from "react"; import Button from "@/components/Button/Button"; -import {Select} from "@/components/Select/Select"; +import {OptionType, Select} from "@/components/Select/Select"; import {useCarModelContext} from "@/api/context/CarModel"; import {add, update} from "@/api/trims"; import {useModalContext} from "@/components/Modal/ModalContext"; import {useTrimContext} from "@/api/context/Trim"; +import {SingleValue} from "react-select"; export default function Trim({ initialData }: any) { const { carModel } = useCarModelContext(); @@ -24,7 +25,7 @@ export default function Trim({ initialData }: any) { car_models_id: initialData?.car_models_id || null, }); - const handleChange = (e: any) => { + const handleChange = (e: React.ChangeEvent) => { const { name, value } = e.target; setFormData({ ...formData, @@ -32,11 +33,10 @@ export default function Trim({ initialData }: any) { }); }; - const handleChangeSelect = (e: any) => { - const { value } = e; + const handleChangeSelect = (e: SingleValue) => { setFormData({ ...formData, - car_models_id: value + car_models_id: e ? e.value : null }); };