added refresh message display

src/component/context/SocketIOContext.jsx

@@ -41,7 +41,7 @@ export default function SocketIOContextProvider({children}) {
         socket.on(socketOnEvents.receive_message, (data) => {
             // setSocketMsgReceived(data.message);
             // dispatch(tableReload({type:'CHATMESSAGELIST'})) // dispatches to update chat message sending from owner to worker and vice versa
-            console.log('DATA', data)
+            console.log('SOCKET RECEIVED DATA *** ', data)
             queryClient.refetchQueries({
                 queryKey: [...queryKeys.recentAction],
                 // type: 'active',

src/component/home/DashPayments.jsx

@@ -59,7 +59,7 @@ export default function DashPayments() {
                             </tr>
                             </thead>
                             <tbody>
-                                {payments.length > 0 ? 
+                                {payments && payments?.length > 0 ?
                                 payments.map((item, index) => {
                                     return (
                                         <tr key={index}>

src/component/product/ProductActive.jsx

@@ -1,21 +1,26 @@
-import React, { useMemo, useRef, useState } from "react";
+import React, {useEffect, useMemo, useRef, useState} from "react";
 import { useSelector } from "react-redux";
 import getImage from "../../utils/getImage";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { productRefreshSite, getSettingsData } from "../../services/services";
 import Settings from "./settingsTab/Settings";
 import queryKeys from "../../services/queryKeys";
+import {SocketContextValues} from "../context/SocketIOContext";
 
 
 export default function ProductActive({productData}){
-
+    const {joinRoom} = SocketContextValues() // Destructures values from socket context
     const iframe = useRef()
 
+    const [refreshMsg, setRefreshMsg] = useState('')
+
     const refresh = useMutation({
         mutationFn: (fields) => {
             return productRefreshSite(fields)
         },
         onSuccess: (res) => {
+            setRefreshMsg(res?.data?.message)
+            setTimeout(()=>{setRefreshMsg('')},3000)
             iframe.current.src += ''
         }
     })
@@ -31,6 +36,13 @@ export default function ProductActive({productData}){
     }
     let externalUrl= 'https://'+productData?.internal_url
 
+    const productSubUID = productData.subscription_uid;
+    useEffect(() => {
+        const provision_room  = "PROVISION_"+productSubUID;
+        console.log("JOINING ROOM ON ACTIVE *** ", provision_room);
+        joinRoom(provision_room); // provision subscription room
+    }, [])
+
     return(
         <>
             {/*<BreadcrumbComBS title='Active Product Name' paths={['Dashboard', 'Product']} />*/}
@@ -58,11 +70,16 @@ export default function ProductActive({productData}){
                                     <iframe ref={iframe} style={{borderWidth: '0px'}} src={externalUrl} width="100%" height="600" title={externalUrl}></iframe>
                                 </div>
                                 <div className="p-4 ml-auto">
-                                    <button type="button" onClick={handleRefresh} className="btn btn-primary">{refresh.isPending ? 'Loading...' : 'Refresh Site'}
+                                    <div className="d-flex justify-end gap-3">
+                                        {refreshMsg &&
+                                            <p className="text-success text-center">{refreshMsg}</p>
+                                        }
+                                        <button type="button" onClick={handleRefresh} className="btn btn-primary">{refresh.isPending ? 'Initiating...' : 'Rebuild Site'}
                                         </button>
                                     </div>
                                 </div>
                             </div>
+                        </div>
                         <div className="col-xxl-6">
                             <div className="card card-statistics">
                                 <div className="card-header">

src/component/product/ProductProvision.jsx

@@ -28,7 +28,9 @@ export default function ProductProvision(props){
     const provisionData = provision?.data
 
     useEffect(() => {
-        joinRoom(productSubUID); // provision subscription room
+        const provision_room  = "PROVISION_"+productSubUID;
+        console.log("JOINING ROOM ON START *** ", provision_room);
+        joinRoom(provision_room); // provision subscription room
     }, [])
 
     return (
@@ -59,8 +61,11 @@ export default function ProductProvision(props){
                                     </div>
                                     <div className="card-body">
                                         <div className="progress">
-                                            <div className="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
+                                            <div className="progress-bar progress-bar-striped progress-bar-animated"
-                                            aria-valuenow={`${provisionData?.percent_completed}%`} aria-valuemin="0" aria-valuemax="100" style={{width:`${provisionData?.percent_completed}%`}} ></div>
+                                                 role="progressbar"
+                                                 aria-valuenow={`${provisionData?.percent_completed}%`}
+                                                 aria-valuemin="0" aria-valuemax="100"
+                                                 style={{width: `${provisionData?.percent_completed}%`}}></div>
                                         </div>
                                     </div>
                                 </div>
@@ -108,8 +113,10 @@ export default function ProductProvision(props){
 
                             <div className="col-lg-6">
                                 <div className="card card-statistics ">
-                                <h4 className="card-title" style={{padding:'10px'}}>Started creating your selection</h4>
+                                    <h4 className="card-title" style={{padding: '10px'}}>Started creating your
-                                <img className="card-img-top" src={getImage('widget/working.jpg')}  alt="Card image cap" />
+                                        selection</h4>
+                                    <img className="card-img-top" src={getImage('widget/working.jpg')}
+                                         alt="Card image cap"/>
                                     {/* <div className="card-body">
                                     <div className="" dangerouslySetInnerHTML={{__html: productDescription}}/>
                                 </div> */}

src/component/product/settingsTab/GeneralTab.jsx

@@ -112,15 +112,9 @@ const GeneralTab = memo(({
                         <>
                             {isCustom === true ?
                                 <>
-                                    {(tabKey === 'template_tab') && <SiteTemplateSelector name={name} data={sortedData}
+                                    {(tabKey === 'template_tab') && <SiteTemplateSelector name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
-                                                                                          isCustom={isCustom}
+                                    {(tabKey === 'url_config_tab') && <URLConfiguration name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
-                                                                                          productData={productData}/>}
+                                    {(tabKey === 'color_scheme_tab') && <ColorStyleConfigure name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
-                                    {(tabKey === 'url_config_tab') && <URLConfiguration name={name} data={sortedData}
-                                                                                        isCustom={isCustom}
-                                                                                        productData={productData}/>}
-                                    {(tabKey === 'color_scheme_tab') && <ColorStyleConfigure name={name} data={sortedData}
-                                                                                             isCustom={isCustom}
-                                                                                             productData={productData}/>}
                                 </>
                                 :
                                 <div className="page-account-form">

src/component/product/settingsTab/SiteTemplateSelector.jsx

@@ -3,6 +3,8 @@ import getImage from "../../../utils/getImage";
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
 import queryKeys from '../../../services/queryKeys';
 import {getProductTemplateData, activateTemplate} from '../../../services/services';
+import {Link} from "react-router-dom";
+import siteLinks from "../../../links/siteLinks";
 
 const SiteTemplateSelector = memo(({name = 'Full Name', data, productData}) => {
 
@@ -24,9 +26,10 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
         const templateResponse = templateData?.data
         const currentTemUID = templateResponse?.current_template_uid
         const templates = templateResponse?.templates
+        const custom_template_name = templateResponse?.custom_template_name
 
         // console.log('data Template', templateResponse)
-        // console.log("Page data == ", data)
+        console.log("Page data == ", data)
 
         const handleActivateTemplate = useMutation({
             mutationFn: (fields) => {
@@ -57,7 +60,26 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
             // console.log(reqData)
             handleActivateTemplate.mutate(reqData)
         }
+        if (custom_template_name && custom_template_name != '') {
+            // This implies we have a custom template , just return here
+            return <>
+                <div className='col-12'>
+                    <div
+                        className="rounded-2 d-flex flex-column justify-content-between align-items-center"
+                        style={{backgroundColor: '#F2FAF7'}}>
+                        <h4 className='p-4 text-black'
+                            style={{marginBottom: '20px'}}>Custom Product Template.</h4>
+                        <img className='' style={{width: '200px'}}
+                             src={getImage('custom-template.png')}
+                             alt='mail-alert'/>
+                        <h4 className='p-4 text-black'
+                            style={{marginTop: '20px'}}>This product is using a custom template named <span
+                            style={{color: 'darkred'}}>&ldquo;{custom_template_name}&rdquo;</span> .</h4>
+                    </div>
+                </div>
 
+            </>
+        }
         return (
             <div className="page-account-form">
                 <div className="p-0">
@@ -87,13 +109,16 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                                                     <div className="card-body">
                                                         <div className="text-center p-2">
                                                             <div className="mb-2">
-                                                    <img  src={getImage('file-icon/svg.png')} alt={template.title} />
+                                                                <img src={getImage('file-icon/svg.png')}
+                                                                     alt={template.title}/>
                                                             </div>
                                                             <h4 className="mb-0">{template.title}</h4>
                                                             {currentTemUID == template.template_uid ?
-                                                <button className="btn btn-light" disabled={true}>Active</button>
+                                                                <button className="btn btn-light"
+                                                                        disabled={true}>Active</button>
                                                                 :
-                                                <button onClick={()=>handleSubmit(template.template_uid)} className="btn btn-primary">Activate</button>
+                                                                <button onClick={() => handleSubmit(template.template_uid)}
+                                                                        className="btn btn-primary">Activate</button>
                                                             }
                                                         </div>
                                                     </div>
@@ -127,7 +152,8 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                                                 <p className={'text-center text-danger'}>{handleActivateTemplate.error.message}</p>
                                                 :
                                                 handleActivateTemplate.isSuccess ?
-                            <p className={'text-center text-success'}>Templated activated successfully</p>
+                                                    <p className={'text-center text-success'}>Templated activated
+                                                        successfully</p>
                                                     :
                                                     null
                                         }

src/component/product/settingsTab/URLConfiguration.jsx

@@ -1,40 +1,140 @@
-const URLConfiguration = () => {
+import {Form, Formik} from "formik";
+import * as Yup from "yup";
+import {useMutation} from '@tanstack/react-query';
+import {setExternalURL} from '../../../services/services';
+import { useState } from "react";
+
+const validationSchema = Yup.object().shape({
+    url: Yup.string().required("URL is required").matches(/^https?:\/\/[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-]+\.[a-zA-Z]+/, 'Must be like: https://example.mysite.com'),
+})
+
+// const initialValues = {
+//     url: '',
+// };
+
+const URLConfiguration = ({productData}) => {
+
+    const [externalURLChanged, setExternalURLChanged] = useState(true)
+
+    const initialValues = {
+        url: productData?.external_url || '',
+    };
+
+    let defaultUrl = 'https://' + productData?.internal_url
+    let externalUrl = productData?.external_url
+
+     const handleExternalURLChanged = (e) => {
+        if(e.target.value == externalUrl){
+            setExternalURLChanged(true)
+        }else{
+            setExternalURLChanged(false)
+        }
+    }
+
+    // API to set url
+    const setURL = useMutation({
+        mutationFn: (fields) => {
+            return setExternalURL(fields)
+        },
+        onSuccess: (res) => {
+            if (res.data.resultCode != '0') {
+                // throw({message: res?.data?.resultDescription})
+                throw({message: 'Something went wrong!'})
+            }
+        },
+        onSettled: () => {
+            setTimeout(() => {
+                setURL.reset()
+            }, 3000)
+        }
+        // onError: (err) => {
+        //     console.log('err', err)
+        // }
+    })
+
+    const handleSubmit = (values) => {
+        let reqData = {
+            token: localStorage.getItem('token'), // USER TOKEN
+            uid: localStorage.getItem('uid'), // USER UID
+            subscription_uid: productData?.subscription_uid,
+            external_url: values.url
+        }
+        setURL.mutate(reqData)
+    }
 
     return <>
         <div className="card card-statistics">
             <div className="card-header">
                 <div className="card-heading">
-                    <h4 className="card-title">URL Configuration</h4>
+                    <h4 className="card-title" style={{textTransform: 'none'}}>{defaultUrl}</h4>
                 </div>
             </div>
-            <div className="card-body button-list">
+            {/*<div className="card-body">*/}
-                <div className="row">
+            {/*    <div className="form-group">*/}
-                    <div className="col-12 mb-2">
+            {/*        /!*<label htmlFor="exampleInputEmail1">Email address</label>*!/*/}
-                        <div className="alert alert-primary" role="alert" style={{borderRadius: '10px'}}>
+            {/*        <input type="email" className="form-control"*/}
-                            <h3 className="text-white">Default URL</h3>
+            {/*               aria-describedby="defaultUrlHelp" value={defaultUrl} readOnly={true} />*/}
-                            <p className="text-white">
+            {/*    </div>*/}
-                                https://127476.devprov.mermsemr.com
+            {/*</div>*/}
-                            </p>
         </div>
-                    </div>
+
-                </div>
+        <Formik
-            </div>
+            initialValues={initialValues}
-        </div>
+            validationSchema={validationSchema}
-        <div className="card card-statistics">
+            onSubmit={handleSubmit}
+        >
+            {(props) => {
+                return (
+                    <Form className='w-full'>
+                        <div className="card card-statistics" style={{backgroundColor: '#b6e5ef'}}>
                             <div className="card-header">
                                 <div className="card-heading">
-                    <h4 className="card-title">Default</h4>
+                                    <h4 className="card-title" style={{textTransform: 'none'}}>Set your own URL</h4>
                                 </div>
                             </div>
                             <div className="card-body">
                                 <div className="form-group">
-                    <label htmlFor="exampleInputEmail1">Email address</label>
+                                    <label htmlFor="exampleInputEmail1">Enter your full URL <span
-                    <input type="email" className="form-control" id="exampleInputEmail1"
+                                        className={`${(props.errors.url && props.touched.url) && 'text-danger'}`}>{props.errors.url}</span></label>
-                           aria-describedby="emailHelp" placeholder="Enter your url"/>
+                                    <input value={props.values.url} onChange={(e)=>{props.handleChange(e); handleExternalURLChanged(e)}} type="text"
+                                           className="form-control" id="url" aria-describedby="url"
+                                           placeholder="https://example.mysite.com"/>
                                 </div>
-                <button type="submit" className="btn btn-primary">Submit</button>
+                                <div style={{width: '100%', textAlign: 'right'}}>
+                                    <button 
+                                        type="submit" 
+                                        disabled={setURL.isPending || externalURLChanged}
+                                        className="btn btn-primary"
+                                    >
+                                        {setURL.isPending ? 'Loading...' : 'Submit'}
+                                    </button>
                                 </div>
                             </div>
+
+                            {setURL.error &&
+                                <div className="col-12">
+                                    <p className='text-danger'>{setURL.error.message}</p>
+                                </div>
+                            }
+
+                            {setURL.isSuccess &&
+                                <div className="col-12">
+                                    <p className='text-success'>{'Completed successfully'}</p>
+                                </div>
+                            }
+                            <div style={{backgroundColor: '#94b8c0', borderRadius: '10px', padding: '10px'}}>
+                                Final steps to configure your URL:<br/>
+                                DNS:<br/>
+                                DNS:<br/>
+                                DNS:<br/>
+
+                            </div>
+                        </div>
+                    </Form>
+                );
+            }}
+        </Formik>
+
     </>
 }
 

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -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 { 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";
@@ -13,17 +13,19 @@ import {updateUserDetails} from "../../store/UserDetails";
 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").matches(
-//     introduction: '',
+    /^[a-zA-Z0-9]+$/, // Regex for alphanumeric characters
-//   };
+    'Must contain only alphanumeric characters' // Custom error message
+    ),
+})
 
 
 export default function ProfileCompleteCom() {
@@ -35,6 +37,7 @@ export default function ProfileCompleteCom() {
     const {state: {redirectLink}} = useLocation()
 
     const [practices, setPractices] = useState([])
+    const [specialties, setSpecialties] = useState([])
 
     const [initialValues, setInitialValues] = useState({
         practice: '',
@@ -43,21 +46,18 @@ export default function ProfileCompleteCom() {
         url_name: ''
     })
 
-    const specialties = useMemo(() => { // FUNCTION TO UPDATE SPECIALITY ARRAY EACH TIME PRACTICE CHANGES
+    const handleUpdateSpecialties = (e) => {
         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({
         mutationFn: (fields) => {
-            const {practice, specialization} = fields
+            const {practice, specialization, url_name} = fields
             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)
         },
@@ -94,15 +94,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 = {
             token: localStorage.getItem('token'), // USER TOKEN
             uid: localStorage.getItem('uid'), // USER UID
-            ...initialValues
+            ...values
         }
         mutation.mutate(reqData)
     }
@@ -146,10 +142,19 @@ export default function ProfileCompleteCom() {
                             <div className="card-body">
                                 <div className='h-100 row flex-column'>
                                     {/* <div className="row"> */}
+                                    <Formik
+                                        initialValues={initialValues}
+                                        validationSchema={validationSchema}
+                                        onSubmit={handleCompleteProfile}
+                                        enableReinitialize={true}
+                                    >
+                                        {(props) => {
+                                        return (
+                                            <Form className='mt-2'>
                                                 <>
                                                     <div className="">
                                                         <div className="form-group position-relative">
-                                                <label className={`text-black fw-bold control-label`}>Practice :</label>
+                                                            <label className={`text-black fw-bold control-label`}>Practice : <span className="text-danger">{(props.errors.practice && props.touched.practice) && props.errors.practice}</span></label>
                                                             <div className="position-relative">
                                                                 {/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
                                                                     <option value=''>Select</option>
@@ -157,8 +162,10 @@ export default function ProfileCompleteCom() {
                                                                         <option key={index} value={practice.practice}>{practice.practice}</option>
                                                                     ))}
                                                                 </select> */}
-                                                    <select onChange={handlePracticeChange} name='practice'
+                                                                <select 
-                                                            value={initialValues.practice} className="form-control">
+                                                                        onChange={(e) => {props.handleChange(e); props.setFieldValue('specialization', ''); handleUpdateSpecialties(e)}} 
+                                                                        name='practice'
+                                                                        value={props.values.practice} className="form-control">
                                                                     <option value=''>Select</option>
                                                                     {practices.map((practice, index) => (
                                                                         <option key={index}
@@ -177,10 +184,10 @@ export default function ProfileCompleteCom() {
                                                     <div className="">
                                                         <div className="form-group">
                                                             <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">
-                                                    <select onChange={handlePracticeChange} name='specialization'
+                                                                <select onChange={props.handleChange} name='specialization'
-                                                            value={initialValues.specialization}
+                                                                        value={props.values.specialization}
                                                                         className="form-control">
                                                                     <option value=''>Select</option>
                                                                     {specialties.map((specialty, index) => (
@@ -198,11 +205,10 @@ export default function ProfileCompleteCom() {
 
                                                     <div className="">
                                                         <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'}}
-                                                          className="form-control" value={initialValues.introduction}
+                                                                    className="form-control" value={props.values.introduction}
-                                                          onChange={handlePracticeChange}/>
+                                                                    onChange={props.handleChange}/>
                                                         </div>
                                                     </div>
 
@@ -225,7 +231,7 @@ export default function ProfileCompleteCom() {
 
                                                     <div className="">
                                                         <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'}}>
                                                                 {/* <select onChange={handlePracticeChange} name='url_name'
                                                                         value={initialValues.url_name} className="form-control">
@@ -242,8 +248,8 @@ export default function ProfileCompleteCom() {
                                                                 }}/> */}
                                                                 <input
                                                                     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}
                                                                     maxLength={16}
                                                                 />
@@ -268,10 +274,14 @@ export default function ProfileCompleteCom() {
                                                     }
 
                                                     <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>
                                                     </div>
                                                 </>
+                                            </Form>
+                                        );
+                                        }}
+                                    </Formik>
                                     {/* </div> */}
                                 </div>
                             </div>

src/services/services.js

@@ -246,6 +246,14 @@ export const getCommonPractice = (reqData) => {
     return postAuxEnd(`/panel/common/practice`, postData, false)
 }
 
+// FUNCTION TO SET EXTERNAL URL
+export const setExternalURL = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/panel/myproduct/external-url', postData, false)
+}
+