fixed API issue

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -1,67 +1,99 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
-import { useLocation } from "react-router-dom";
+// import { useLocation } from "react-router-dom";
-import { Form, Formik } from "formik";
+// import { Form, Formik } from "formik";
 import * as Yup from "yup";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import getImage from "../../utils/getImage";
 import { IoMdArrowDropdown } from "react-icons/io";
 import { completeProfile, getCommonPractice } from '../../services/services';
+import siteLinks from "../../links/siteLinks";
+import { useNavigate } from "react-router-dom";
 
 
-const validationSchema = Yup.object().shape({
+// const validationSchema = Yup.object().shape({
-    practice: Yup.string().required("Required"),
+//     practice: Yup.string().required("Required"),
-    specialization: Yup.string().required("Required"),
+//     specialization: Yup.string().required("Required"),
-    introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
+//     introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
-  })
+// })
 
-  const initialValues = {
+//   const initialValues = {
-    practice: '',
+//     practice: '',
-    specialization: '',
+//     specialization: '',
-    introduction: '',
+//     introduction: '',
-  };
+//   };
 
 
 export default function ProfileCompleteCom(){
 
-    const [practices, setPractices] = useState({practice: [], specialization: []})
+    const navigate = useNavigate()
+
+    const [practices, setPractices] = useState([])
+    
+    const [initialValues, setInitialValues] = useState({
+        practice: '',
+        specialization: '',
+        introduction: '',
+    })
+
+    const specialties = useMemo(()=>{ // FUNCTION TO UPDATE SPECIALITY ARRAY EACH TIME PRACTICE CHANGES
+        setInitialValues(prev => ({...prev, specialization: ''}))
+        if(!initialValues.practice){
+            return []
+        }
+        const specialtiesArr = practices.filter(item => item.practice == initialValues.practice)[0]?.specialties
+        return specialtiesArr
+    },[initialValues.practice])
 
-    const {state:{profile_completed}} = useLocation()
 
     const mutation = useMutation({
         mutationFn: (fields) => {
+            const {practice, specialization} = fields
+            if(!practice || !specialization){
+                throw new Error('Please select both practice and specialization fields')
+            }
             return completeProfile(fields)
         },
+        onError: () => {
+            setTimeout(()=>{mutation.reset()}, 4000)
+        },
         onSuccess: (res) => {
-            console.log('res', res)
+            setTimeout(()=>{
+                navigate(siteLinks.home)
+            },2000)
+            // console.log('res', res)
         }
     })
 
-    const handleCompleteProfile = (values, helpers) => {
-    // helpers.resetForm()
-    let reqData = {
-        token: localStorage.getItem('token'), // USER TOKEN
-        uid: localStorage.getItem('uid'), // USER UID
-        // ...values
-    }
-    console.log('values', values, helpers)
-    // mutation.mutate(reqData)
-    }
-
     const commonPractices = useMutation({ // FUNCTION TO GET COMMON PRACTICES
         mutationFn: (fields) => {
             return getCommonPractice(fields)
         },
         onError: ()=> {
-            setPractices({practice: [], specialization: []})
+            setPractices([])
         },
         onSuccess: (res) => {
-            let returnPractices = []
+            if(!res?.data){
-            let returnSpecialization = []
+                return setPractices([])
-            setPractices(res)
+            }
+            let returnPractices = Object.entries(res?.data).filter(([key, value]) => typeof value == 'object')?.map(item => item[1])
+            setPractices(returnPractices)
         }
     })
 
+    const handlePracticeChange = ({target:{name, value}}) => {
+        setInitialValues(prev => ({...prev, [name]:value}))
+    }
+
+    const handleCompleteProfile = () => { // FUNCTION TO COMPLETE PROFILE
+        let reqData = {
+            token: localStorage.getItem('token'), // USER TOKEN
+            uid: localStorage.getItem('uid'), // USER UID
+            ...initialValues
+        }
+        mutation.mutate(reqData)
+    }
+
     useEffect(()=>{
         let reqData = {
             token: localStorage.getItem('token'), // USER TOKEN
@@ -70,8 +102,6 @@ export default function ProfileCompleteCom(){
         commonPractices.mutate(reqData)
     },[])
 
-    console.log('practices', practices)
-
     return <>
 
         <BreadcrumbComBS title='Update Profile' paths={['Dashboard', 'Profile']} />
@@ -101,67 +131,67 @@ export default function ProfileCompleteCom(){
                         </div> */}
                         {/* <div style={{minHeight: '400px'}}></div> */}
                         <div className="card-body">
-                            <Formik
+                            <div className='h-100 row flex-column'>
-                                initialValues={initialValues}
+                                {/* <div className="row"> */}
-                                validationSchema={validationSchema}
+                                    <>
-                                onSubmit={handleCompleteProfile}
+                                        <div className="">
-                            >
+                                            <div className="form-group position-relative">
-                                {(props) => {
+                                                <label className={`text-black fw-bold control-label`}>Practice :</label>
-                                return (
+                                                <div className="position-relative">    
-                                    <Form className='h-100 row flex-column'>
+                                                    {/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
-                                        {/* <div className="row"> */}
+                                                        <option value=''>Select</option>
+                                                        {practices.map((practice, index)=>(
+                                                            <option key={index} value={practice.practice}>{practice.practice}</option>
+                                                        ))}
+                                                    </select> */}
+                                                    <select onChange={handlePracticeChange} name='practice' value={initialValues.practice} className="form-control">
+                                                        <option value=''>Select</option>
+                                                        {practices.map((practice, index)=>(
+                                                            <option key={index} value={practice.practice}>{practice.practice}</option>
+                                                        ))}
+                                                    </select>
+                                                    <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div className="">
+                                            <div className="form-group">
+                                                <label className={`text-black fw-bold control-label`}>Specialization :</label>
+                                                <div className="position-relative">
+                                                    <select onChange={handlePracticeChange} name='specialization' value={initialValues.specialization} className="form-control">
+                                                        <option value=''>Select</option>
+                                                        {specialties.map((specialty, index)=>(
+                                                            <option key={index} value={specialty}>{specialty}</option>
+                                                        ))}
+                                                    </select>
+                                                    <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div className="">
+                                            <div className="form-group position-relative">
+                                                <label className={`text-black fw-bold control-label`}>General Information :</label>
+                                                <textarea name='introduction' rows={10} style={{resize: 'none'}} className="form-control" value={initialValues.introduction} onChange={handlePracticeChange} />
+                                            </div>
+                                        </div>
+                        
+
+                                        {(mutation.isError || mutation.isSuccess) &&
                                             <>
-                                                <div className="">
+                                            <div className="">
-                                                    <div className="form-group position-relative">
+                                                <p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully, redirecting...' : mutation.error.message}</p>
-                                                        <label className={`text-black fw-bold control-label ${(props.errors.practice && props.touched.practice) && 'text-danger'}`}>Practice :</label>
+                                            </div>
-                                                        <div className="position-relative">    
-                                                            <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
-                                                                <option value=''>Select</option>
-                                                                <option value='engineering'>Engineering</option>
-                                                            </select>
-                                                            <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
-                                                        </div>
-                                                    </div>
-                                                </div>
-
-                                                <div className="">
-                                                    <div className="form-group">
-                                                        <label className={`text-black fw-bold control-label ${(props.errors.specialization && props.touched.specialization) && 'text-danger'}`}>Specialization :</label>
-                                                        <div className="position-relative">
-                                                            <select onChange={props.handleChange} name='specialization' value={props.values.specialization} className="form-control">
-                                                                <option value=''>Select</option>
-                                                                <option value='construction'>Construction</option>
-                                                            </select>
-                                                            <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
-                                                        </div>
-                                                    </div>
-                                                </div>
-
-                                                <div className="">
-                                                    <div className="form-group position-relative">
-                                                        <label className={`text-black fw-bold control-label ${(props.errors.introduction && props.touched.introduction) && 'text-danger'}`}>General Information :</label>
-                                                        <textarea name='introduction' rows={10} style={{resize: 'none'}} className="form-control" value={props.values.introduction} onChange={props.handleChange} />
-                                                    </div>
-                                                </div>
-                                
-
-                                                {/* {(mutation.isError || mutation.isSuccess) &&
-                                                    <>
-                                                    <div className="col-12">
-                                                        <p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully' : mutation.error.message}</p>
-                                                    </div>
-                                                    </>
-                                                } */}
-
-                                                <div className="mt-auto text-end">
-                                                    <button type='submit' className="btn btn-primary text-uppercase">{false ? 'loading...' : 'Continue'}</button>
-                                                </div>
                                             </>
-                                        {/* </div> */}
+                                        }
-                                    </Form>
+
-                                );
+                                        <div className="mt-auto text-end">
-                                }}
+                                            <button type='button' onClick={handleCompleteProfile} className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Continue'}</button>
-                            </Formik>
+                                        </div>
+                                    </>
+                                {/* </div> */}
+                            </div>
                         </div>
                     </div>
                 </div>