diff --git a/src/modal/confirmModal/confirmModalAdvertisement.jsx b/src/modal/confirmModal/confirmModalAdvertisement.jsx index 5a39cdc..79c5f34 100644 --- a/src/modal/confirmModal/confirmModalAdvertisement.jsx +++ b/src/modal/confirmModal/confirmModalAdvertisement.jsx @@ -3,7 +3,7 @@ import { ConfDiv } from './confirmModal.styled'; import { setIsOpen } from 'redux/modal/modalSlice'; import { XBTN } from './confirmModalSVG'; -const СonfirmModalAdvertisement = ({ handleSearch1 }) => { +const СonfirmModalAdvertisement = ({ clearForm }) => { const dispatch = useDispatch(); const closeModal = () => { @@ -11,27 +11,8 @@ const СonfirmModalAdvertisement = ({ handleSearch1 }) => { }; const confirmModalAdvertisement = () => { - handleSearch1({ - 'advertisementDTO.carDTO.carMark.name': '', - 'advertisementDTO.carDTO.carMark.carModel.name': '', - 'advertisementDTO.carDTO.carNumber': '', - 'advertisementDTO.region.name': '', - 'advertisementDTO.region.city.name': '', - 'advertisementDTO.carDTO.mileage': '', - 'advertisementDTO.carDTO.yearToCreate': '', - 'advertisementDTO.price': '', - 'advertisementDTO.carDTO.bodyType.name': '', - 'advertisementDTO.carDTO.engine.name': '', - 'advertisementDTO.carDTO.engine.volume': '', - 'advertisementDTO.carDTO.driveType.name': '', - 'advertisementDTO.carDTO.transmission.name': '', - 'advertisementDTO.carDTO.technicalState.name': '', - 'advertisementDTO.carDTO.color.name': '', - 'advertisementDTO.carDTO.vinNumber': '', - 'advertisementDTO.description': '', - 'advertisementDTO.ownerName': '', - 'advertisementDTO.ownerPhone': '', - }); + console.log('Confirming and clearing form...'); + clearForm(); dispatch(setIsOpen(false)); }; diff --git a/src/modal/modal2.jsx b/src/modal/modal2.jsx index 9db345a..df84ebe 100644 --- a/src/modal/modal2.jsx +++ b/src/modal/modal2.jsx @@ -7,14 +7,14 @@ import ModalWraper from './modalWraper/modalWraper'; import ConfirmModalAdvertisement from './confirmModal/confirmModalAdvertisement'; -const Modal = ({ handleSearch1 }) => { +const Modal2 = ({ handleClearForm}) => { const isOpen = useSelector(selectIsOpen); return ReactDOM.createPortal( <> {isOpen && ( - + )} , @@ -22,4 +22,4 @@ const Modal = ({ handleSearch1 }) => { ); }; -export default Modal; \ No newline at end of file +export default Modal2; \ No newline at end of file diff --git a/src/pages/AdvertisementPage/AdvertisementPage.jsx b/src/pages/AdvertisementPage/AdvertisementPage.jsx index ad62125..da46d96 100644 --- a/src/pages/AdvertisementPage/AdvertisementPage.jsx +++ b/src/pages/AdvertisementPage/AdvertisementPage.jsx @@ -55,30 +55,9 @@ const AdvertisementForm = ({ initialValues}) => { const [selectedRegion, setSelectedRegion] = useState(''); const [selectedCity, setSelectedCity] = useState(''); const [photos, setPhotos] = useState([]); - // const [values, setValues] = useState({ - // // category: 'All', - // 'advertisementDTO.carDTO.carMark.name': '', - // 'advertisementDTO.carDTO.carMark.carModel.name': '', - // 'advertisementDTO.carDTO.carNumber': '', - // 'advertisementDTO.region.name': '', - // 'advertisementDTO.region.city.name': '', - // 'advertisementDTO.carDTO.mileage': '', - // 'advertisementDTO.carDTO.yearToCreate': '', - // 'advertisementDTO.price': '', - // 'advertisementDTO.carDTO.bodyType.name': '', - // 'advertisementDTO.carDTO.engine.name': '', - // 'advertisementDTO.carDTO.engine.volume': '', - // 'advertisementDTO.carDTO.driveType.name': '', - // 'advertisementDTO.carDTO.transmission.name': '', - // 'advertisementDTO.carDTO.technicalState.name': '', - // 'advertisementDTO.carDTO.color.name': '', - // 'advertisementDTO.carDTO.vinNumber': '', - // 'advertisementDTO.description': '', - // 'advertisementDTO.ownerName': '', - // 'advertisementDTO.ownerPhone': '', - // }); - - const onSubmit = async (values) => { + const onSubmit = async (values) => { + console.log('Form values on submit:', values); + try { console.log('token:', token); const formData = new FormData(); @@ -109,11 +88,16 @@ const AdvertisementForm = ({ initialValues}) => { } }, [initialValues]); - const clearForm = () => { + const openModal = () => { dispatch(setIsOpen(true)); - // formikRef.current.resetForm({ values: initialValues }); } + useEffect(() => { + if (formikRef.current) { + formikRef.current.resetForm({ values: initialValues }); + } + }, [initialValues]); + const onDrop = (acceptedFiles) => { setPhotos([...photos, ...acceptedFiles]); formikRef.current.setFieldValue('photos', [...photos, ...acceptedFiles]); @@ -152,7 +136,7 @@ const AdvertisementForm = ({ initialValues}) => { innerRef={formik => (formikRef.current = formik)} >
- @@ -326,7 +310,7 @@ const AdvertisementForm = ({ initialValues}) => {