Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu 4b6c927efc fixed validation bug 2025-09-23 05:56:33 +01:00
CHIEFSOFT\ameye 8a8adcbbc7 url name 2025-09-22 19:26:28 -04:00
CHIEFSOFT\ameye 706baadb33 url_name 2025-09-22 19:18:07 -04:00
ameye 58128fdd96 Merge branch 'url-name-payload' of MERMS/MermsPanelReactJS into master 2025-09-22 16:33:02 +00:00
@@ -1,7 +1,7 @@
import React, {useEffect, useMemo, useState} from "react"; import React, {useCallback, useEffect, useMemo, useState} from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS"; 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 * as Yup from "yup";
import {useMutation, useQuery} from "@tanstack/react-query"; import {useMutation, useQuery} from "@tanstack/react-query";
import getImage from "../../utils/getImage"; import getImage from "../../utils/getImage";
@@ -13,17 +13,16 @@ import {updateUserDetails} from "../../store/UserDetails";
import {useDispatch} from "react-redux"; import {useDispatch} from "react-redux";
// 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().when('practice', {
// introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"), is: (value) => typeof value === 'string' && value.trim().length > 0,
// }) then: (schema) => schema.required('Required'),
otherwise: (schema) => schema,
// const initialValues = { }),
// practice: '', introduction: Yup.string().min(1, "Minimum 1 character").max(50, "Maximum 50 characters"),
// specialization: '', url_name: Yup.string().min(6, "Minimum 6 characters").max(16, "Maximum 16 characters").required("Required"),
// introduction: '', })
// };
export default function ProfileCompleteCom() { export default function ProfileCompleteCom() {
@@ -35,6 +34,7 @@ export default function ProfileCompleteCom() {
const {state: {redirectLink}} = useLocation() const {state: {redirectLink}} = useLocation()
const [practices, setPractices] = useState([]) const [practices, setPractices] = useState([])
const [specialties, setSpecialties] = useState([])
const [initialValues, setInitialValues] = useState({ const [initialValues, setInitialValues] = useState({
practice: '', practice: '',
@@ -43,21 +43,18 @@ export default function ProfileCompleteCom() {
url_name: '' url_name: ''
}) })
const specialties = useMemo(() => { // FUNCTION TO UPDATE SPECIALITY ARRAY EACH TIME PRACTICE CHANGES const handleUpdateSpecialties = (e) => {
setInitialValues(prev => ({...prev, specialization: ''})) setInitialValues(prev => ({...prev, specialization: ''}))
if (!initialValues.practice) { const specialtiesArr = practices.filter(item => item.practice == e.target.value)[0]?.specialties
return [] setSpecialties(specialtiesArr)
} }
const specialtiesArr = practices.filter(item => item.practice == initialValues.practice)[0]?.specialties
return specialtiesArr
}, [initialValues.practice])
const mutation = useMutation({ const mutation = useMutation({
mutationFn: (fields) => { mutationFn: (fields) => {
const {practice, specialization} = fields const {practice, specialization, url_name} = fields
if (!practice || !specialization || !url_name) { if (!practice || !specialization || !url_name) {
throw new Error('Please select both practice, specialization fields and URL_Name') throw new Error('Please select both practice, specialization and Enter URL_Name')
} }
return completeProfile(fields) return completeProfile(fields)
}, },
@@ -94,15 +91,11 @@ export default function ProfileCompleteCom() {
} }
}) })
const handlePracticeChange = ({target: {name, value}}) => { const handleCompleteProfile = (values) => { // FUNCTION TO COMPLETE PROFILE
setInitialValues(prev => ({...prev, [name]: value}))
}
const handleCompleteProfile = () => { // FUNCTION TO COMPLETE PROFILE
let reqData = { let reqData = {
token: localStorage.getItem('token'), // USER TOKEN token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid'), // USER UID uid: localStorage.getItem('uid'), // USER UID
...initialValues ...values
} }
mutation.mutate(reqData) mutation.mutate(reqData)
} }
@@ -146,132 +139,146 @@ export default function ProfileCompleteCom() {
<div className="card-body"> <div className="card-body">
<div className='h-100 row flex-column'> <div className='h-100 row flex-column'>
{/* <div className="row"> */} {/* <div className="row"> */}
<> <Formik
<div className=""> initialValues={initialValues}
<div className="form-group position-relative"> validationSchema={validationSchema}
<label className={`text-black fw-bold control-label`}>Practice :</label> onSubmit={handleCompleteProfile}
<div className="position-relative"> enableReinitialize={true}
{/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control"> >
<option value=''>Select</option> {(props) => {
{practices.map((practice, index)=>( return (
<option key={index} value={practice.practice}>{practice.practice}</option> <Form className='mt-2'>
))} <>
</select> */} <div className="">
<select onChange={handlePracticeChange} name='practice' <div className="form-group position-relative">
value={initialValues.practice} className="form-control"> <label className={`text-black fw-bold control-label`}>Practice : <span className="text-danger">{(props.errors.practice && props.touched.practice) && props.errors.practice}</span></label>
<option value=''>Select</option> <div className="position-relative">
{practices.map((practice, index) => ( {/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
<option key={index} <option value=''>Select</option>
value={practice.practice}>{practice.practice}</option> {practices.map((practice, index)=>(
))} <option key={index} value={practice.practice}>{practice.practice}</option>
</select> ))}
<IoMdArrowDropdown className='position-absolute w-auto' style={{ </select> */}
top: '50%', <select
right: '2px', onChange={(e) => {props.handleChange(e); props.setFieldValue('specialization', ''); handleUpdateSpecialties(e)}}
transform: 'translateY(-50%)' name='practice'
}}/> value={props.values.practice} className="form-control">
</div> <option value=''>Select</option>
</div> {practices.map((practice, index) => (
</div> <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="">
<div className="form-group"> <div className="form-group">
<label className={`text-black fw-bold control-label`}>Your <label className={`text-black fw-bold control-label`}>Your
Specialization :</label> Specialization : <span className="text-danger">{(props.errors.specialization && props.touched.specialization) && props.errors.specialization}</span></label>
<div className="position-relative"> <div className="position-relative">
<select onChange={handlePracticeChange} name='specialization' <select onChange={props.handleChange} name='specialization'
value={initialValues.specialization} value={props.values.specialization}
className="form-control"> className="form-control">
<option value=''>Select</option> <option value=''>Select</option>
{specialties.map((specialty, index) => ( {specialties.map((specialty, index) => (
<option key={index} value={specialty}>{specialty}</option> <option key={index} value={specialty}>{specialty}</option>
))} ))}
</select> </select>
<IoMdArrowDropdown className='position-absolute w-auto' style={{ <IoMdArrowDropdown className='position-absolute w-auto' style={{
top: '50%', top: '50%',
right: '2px', right: '2px',
transform: 'translateY(-50%)' transform: 'translateY(-50%)'
}}/> }}/>
</div> </div>
</div> </div>
</div> </div>
<div className=""> <div className="">
<div className="form-group position-relative"> <div className="form-group position-relative">
<label className={`text-black fw-bold control-label`}>Other General <label className={`text-black fw-bold control-label`}>Other General Information : <span className="text-danger">{(props.errors.introduction && props.touched.introduction) && props.errors.introduction}</span></label>
Information :</label> <textarea name='introduction' rows={5} style={{resize: 'none'}}
<textarea name='introduction' rows={5} style={{resize: 'none'}} className="form-control" value={props.values.introduction}
className="form-control" value={initialValues.introduction} onChange={props.handleChange}/>
onChange={handlePracticeChange}/> </div>
</div> </div>
</div>
<div className=""> <div className="">
<div className="form-group position-relativ'e"> <div className="form-group position-relativ'e">
{/*<label className={`text-black fw-bold control-label`}>What we use this*/} {/*<label className={`text-black fw-bold control-label`}>What we use this*/}
{/* information for :</label>*/} {/* information for :</label>*/}
<div style={{ <div style={{
fontSize: '14px', fontSize: '14px',
borderRadius: '10px', borderRadius: '10px',
backgroundColor: 'aliceblue', backgroundColor: 'aliceblue',
fontWeight: 'bolder', fontWeight: 'bolder',
padding: '15px' padding: '15px'
}}> }}>
MERMS A.I. agents use the information supplied to help generate MERMS A.I. agents use the information supplied to help generate
useful entries for your product settings. useful entries for your product settings.
</div> </div>
</div> </div>
</div> </div>
<div className=""> <div className="">
<div className="form-group position-relative"> <div className="form-group position-relative">
<label className={`text-black fw-bold control-label`}>URL Name :</label> <label className={`text-black fw-bold control-label`}>URL Name : <span className="text-danger">{(props.errors.url_name && props.touched.url_name) && props.errors.url_name}</span></label>
<div className="position-relative d-flex flex-column flex-xxl-row" style={{gap: '10px'}}> <div className="position-relative d-flex flex-column flex-xxl-row" style={{gap: '10px'}}>
{/* <select onChange={handlePracticeChange} name='url_name' {/* <select onChange={handlePracticeChange} name='url_name'
value={initialValues.url_name} className="form-control"> value={initialValues.url_name} className="form-control">
<option value=''>Select</option> <option value=''>Select</option>
{practices.map((practice, index) => ( {practices.map((practice, index) => (
<option key={index} <option key={index}
value={practice.practice}>{practice.practice}</option> value={practice.practice}>{practice.practice}</option>
))} ))}
</select> </select>
<IoMdArrowDropdown className='position-absolute w-auto' style={{ <IoMdArrowDropdown className='position-absolute w-auto' style={{
top: '50%', top: '50%',
right: '2px', right: '2px',
transform: 'translateY(-50%)' transform: 'translateY(-50%)'
}}/> */} }}/> */}
<input <input
className="form-control" className="form-control"
onChange={handlePracticeChange} name='url_name' onChange={props.handleChange} name='url_name'
value={initialValues.url_name} value={props.values.url_name}
minLength={6} minLength={6}
maxLength={16} maxLength={16}
/> />
<p className="border-radius-10 p-2 border border-warning" <p className="border-radius-10 p-2 border border-warning"
style={{fontSize: "1.0rem"}}>We use the URL Name to form part of style={{fontSize: "1.0rem"}}>We use the URL Name to form part of
your default URL when we configure your default URL when we configure
a new URL for your products. You can always change your product a new URL for your products. You can always change your product
URL. <br/> URL. <br/>
<b>Example : <span style={{color: 'red'}}>url_name</span>.product.mermsemr.com <b>Example : <span style={{color: 'red'}}>url_name</span>.product.mermsemr.com
</b> </b>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
{(mutation.isError || mutation.isSuccess) && {(mutation.isError || mutation.isSuccess) &&
<> <>
<div className=""> <div className="">
<p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully, redirecting...' : mutation.error.message}</p> <p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully, redirecting...' : mutation.error.message}</p>
</div> </div>
</> </>
} }
<div className="mt-auto text-end"> <div className="mt-auto text-end">
<button type='button' onClick={handleCompleteProfile} <button type='submit'
className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Continue'}</button> className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Continue'}</button>
</div> </div>
</> </>
</Form>
);
}}
</Formik>
{/* </div> */} {/* </div> */}
</div> </div>
</div> </div>