Feature/task 7 formik #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,10 +1,29 @@ | ||||||
| import "./UpsertMovieModal.css"; | ||||||
| import React from "react"; | ||||||
| import GenresRepo from "../services/GenreRepo"; | ||||||
| import { useDispatch } from "react-redux"; | ||||||
| import { bindActionCreators } from "redux"; | ||||||
| import { actionCreators } from "../store"; | ||||||
| import { useFormik } from "formik"; | ||||||
| import * as Yup from "yup"; | ||||||
|
|
||||||
| const MovieSchema = Yup.object().shape({ | ||||||
| title: Yup.string().required(), | ||||||
| url: Yup.string().required(), | ||||||
| releaseDate: Yup.string().required(), | ||||||
| rating: Yup.number() | ||||||
|
Collaborator
There was a problem hiding this comment. For number you can use
Suggested change
|
||||||
| .required() | ||||||
| .test("is more the 0 less then 10", | ||||||
| "Rating must be from 0 to 10 ", (val)=>{ | ||||||
| return val >= 0 && val <= 10 | ||||||
| }), | ||||||
| runtime: Yup.number() | ||||||
| .required() | ||||||
| .test("more then 0", "runtime should be positive", val=>{ | ||||||
| return val >= 0 | ||||||
| }), | ||||||
| overview: Yup.string().required() | ||||||
| }) | ||||||
|
Collaborator
There was a problem hiding this comment. Also you can check data types in the backend side, they use |
||||||
|
|
||||||
|
|
||||||
| export default function UpsertMovieModal({header, movie, handleCloseModal}){ | ||||||
|
|
@@ -14,25 +33,37 @@ export default function UpsertMovieModal({header, movie, handleCloseModal}){ | |||||
| const genreRepo = new GenresRepo(); | ||||||
| const genres = genreRepo.getAllGenres(); | ||||||
|
|
||||||
| const defaultFormData = {} | ||||||
|
|
||||||
| if(movie !== undefined) { | ||||||
| defaultFormData.title = movie.title; | ||||||
| defaultFormData.url = movie.poster_path; | ||||||
| defaultFormData.rating = movie.vote_average; | ||||||
| defaultFormData.runtime = movie.runtime; | ||||||
| defaultFormData.overview = movie.overview; | ||||||
| defaultFormData.releaseDate = movie.release_date; | ||||||
| } | ||||||
|
|
||||||
| const formik = useFormik({ | ||||||
| initialValues: defaultFormData, | ||||||
| validationSchema: MovieSchema, | ||||||
| onSubmit: values => { | ||||||
| console.log(values) | ||||||
| if (movie === undefined){ | ||||||
| handleCreate(values); | ||||||
| } else { | ||||||
| handleUpdate(movie, values); | ||||||
| } | ||||||
| handleCloseModal(); | ||||||
| } | ||||||
| }) | ||||||
|
|
||||||
| const handleUpdate = (movie, formData)=>{ | ||||||
| if(formData.title){ | ||||||
| movie.title = formData.title; | ||||||
| } | ||||||
| if(formData.genre && formData.genre !== "All"){ | ||||||
| movie.genres = [formData.genre]; | ||||||
| } | ||||||
|
|
||||||
| if(formData.url){ | ||||||
|
|
@@ -50,6 +81,10 @@ export default function UpsertMovieModal({header, movie, handleCloseModal}){ | |||||
| movie.overview = formData.overview; | ||||||
| } | ||||||
|
|
||||||
| if(formData.releaseDate){ | ||||||
| movie.release_date = formData.releaseDate; | ||||||
| } | ||||||
|
|
||||||
| updateMovie(movie) | ||||||
| }; | ||||||
|
|
||||||
|
|
@@ -62,60 +97,108 @@ export default function UpsertMovieModal({header, movie, handleCloseModal}){ | |||||
| newMovie.vote_average = Number(formData.rating); | ||||||
| newMovie.runtime = Number(formData.runtime); | ||||||
| newMovie.overview = formData.overview; | ||||||
| newMovie.release_date = formData.releaseDate; | ||||||
| createMovie(newMovie) | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| <h1>{header}</h1> | ||||||
| <form className="addMovieForm" onSubmit={formik.handleSubmit} onReset={formik.handleReset}> | ||||||
| <div className="col1-2 row1 form-input"> | ||||||
| <label >TITLE</label> | ||||||
| <input | ||||||
| placeholder="Best Movie" | ||||||
| type="text" | ||||||
| name="title" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.title} | ||||||
| onBlur={formik.handleBlur('title')} | ||||||
| /> | ||||||
| {formik.touched.title && formik.errors.title} | ||||||
|
Collaborator
There was a problem hiding this comment. Create a simple component which will render error according to mockup |
||||||
| </div> | ||||||
|
|
||||||
| <div className="col1-2 row2 form-input"> | ||||||
| <label>MOVIE URL</label> | ||||||
| <input | ||||||
| type="text" | ||||||
| placeholder="http://picture-url" | ||||||
| name="url" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.url} | ||||||
| onBlur={formik.handleBlur('url')} | ||||||
|
|
||||||
| /> | ||||||
| {formik.touched.url && formik.errors.url} | ||||||
| </div> | ||||||
|
|
||||||
| <div className="col1-2 row3 form-input"> | ||||||
| <label>GENRE</label> | ||||||
| <select | ||||||
| name="genre" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.genre} | ||||||
| onBlur={formik.handleBlur('genre')}> | ||||||
|
|
||||||
| {genres.map((genre) => | ||||||
| <option key={genre.id}>{genre.name}</option> | ||||||
| )} | ||||||
| </select> | ||||||
| {formik.touched.genre && formik.errors.genre} | ||||||
| </div> | ||||||
|
|
||||||
| <div className="col3 row1 form-input"> | ||||||
| <label>RELEASE DATE</label> | ||||||
| <input type="date" onChange={formik.handleChange} | ||||||
| value = {formik.values.releaseDate} | ||||||
| name="releaseDate" | ||||||
| onBlur={formik.handleBlur('releaseDate')} | ||||||
| /> | ||||||
| {formik.touched.releaseDate && formik.errors.releaseDate} | ||||||
|
|
||||||
| </div> | ||||||
|
|
||||||
| <div className="col3 row2 form-input"> | ||||||
| <label>RATING</label> | ||||||
| <input | ||||||
| placeholder="7.8" | ||||||
| type="text" | ||||||
| name="rating" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.rating} | ||||||
| onBlur={formik.handleBlur('rating')} | ||||||
|
|
||||||
| /> | ||||||
| {formik.touched.rating && formik.errors.rating} | ||||||
| </div> | ||||||
|
|
||||||
| <div className="col3 row3 form-input"> | ||||||
| <label>RUNTIME</label> | ||||||
| <input | ||||||
| placeholder="120" | ||||||
| type="text" | ||||||
| name="runtime" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.runtime} | ||||||
| onBlur={formik.handleBlur('runtime')} | ||||||
|
|
||||||
| /> | ||||||
| {formik.touched.runtime && formik.errors.runtime} | ||||||
| </div> | ||||||
|
|
||||||
| <div className="col1-3 row4 form-input"> | ||||||
| <label>OVERVIEW</label> | ||||||
| <textarea | ||||||
| placeholder="Lorem ipsum" | ||||||
| type="text" | ||||||
| name="overview" | ||||||
| onChange={formik.handleChange} | ||||||
| value={formik.values.overview} | ||||||
| onBlur={formik.handleBlur('overview')} | ||||||
|
|
||||||
| /> | ||||||
| {formik.touched.overview && formik.errors.overview} | ||||||
| </div> | ||||||
|
|
||||||
| <div className="col2-3 row5 form-control"> | ||||||
|
|
@@ -128,4 +211,3 @@ export default function UpsertMovieModal({header, movie, handleCloseModal}){ | |||||
| </> | ||||||
| ); | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will be logically if it has url validation, because random string couldn't be a url. Yup has api for it