populated externl URL

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

@@ -1,14 +1,14 @@
 import React, {memo} from 'react'
 import getImage from "../../../utils/getImage";
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
 import queryKeys from '../../../services/queryKeys';
-import { getProductTemplateData, activateTemplate } from '../../../services/services';
+import {getProductTemplateData, activateTemplate} from '../../../services/services';
 
-const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
+const SiteTemplateSelector = memo(({name = 'Full Name', data, productData}) => {
 
         const queryClient = useQueryClient()
 
-        const {data:templateData, isFetching, isError, error} = useQuery({
+        const {data: templateData, isFetching, isError, error} = useQuery({
             queryKey: queryKeys.productTemplateData,
             queryFn: () => {
                 let reqData = {
@@ -16,7 +16,7 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                     uid: localStorage.getItem('uid'), // USER UID
                     product_id: productData?.product_id
                 }
-            return getProductTemplateData(reqData)
+                return getProductTemplateData(reqData)
             },
             staleTime: 0
         })
@@ -24,16 +24,17 @@ 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) => {
                 return activateTemplate(fields)
             },
             onSuccess: (res) => {
-                if(res?.data?.resultCode != '0'){
+                if (res?.data?.resultCode != '0') {
                     throw new Error(res.data.resultDescription)
                 }
                 queryClient.refetchQueries({  // refetches productProvision API call
@@ -41,7 +42,7 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                 })
             },
             onSettled: () => {
-                setTimeout(()=>{
+                setTimeout(() => {
                     handleActivateTemplate.reset()
                 }, 3000)
             }
@@ -57,51 +58,57 @@ 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 <>This product is using a custom template named {custom_template_name} </>
+        }
         return (
             <div className="page-account-form">
                 <div className="p-0">
-                    {isFetching ? 
+                    {isFetching ?
-                    <>
-                        <div className="row">
-                            <div className="col-12">
-                                <p className='text-mute'>Loading...</p>
-                            </div>
-                        </div>
-                    </>
-                    : isError ?
-                    <div className="row">
-                        <div className="col-12">
-                            <p className='text-danger'>{error?.message}</p>
-                        </div>
-                    </div>
-                    :
-                    <div className="row">
                         <>
-                        {!templates?.length ?
+                            <div className="row">
-                            <p>No data Found</p>
+                                <div className="col-12">
-                            :
+                                    <p className='text-mute'>Loading...</p>
-                            templates.map(template => (
-                                <div key={template.template_uid} className="col-xl-6 col-sm-6">
-                                    <div className="card card-statistics">
-                                        <div className="card-body">
-                                            <div className="text-center p-2">
-                                                <div className="mb-2">
-                                                    <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 onClick={()=>handleSubmit(template.template_uid)} className="btn btn-primary">Activate</button>
-                                                }
-                                            </div>
-                                        </div>
-                                    </div>
                                 </div>
-                            ))
+                            </div>
-                        }
+                        </>
-                            {/* {Object.entries(data)?.map(([key, value]) => (
+                        : isError ?
+                            <div className="row">
+                                <div className="col-12">
+                                    <p className='text-danger'>{error?.message}</p>
+                                </div>
+                            </div>
+                            :
+                            <div className="row">
+                                <>
+                                    {!templates?.length ?
+                                        <p>No data Found</p>
+                                        :
+                                        templates.map(template => (
+                                            <div key={template.template_uid} className="col-xl-6 col-sm-6">
+                                                <div className="card card-statistics">
+                                                    <div className="card-body">
+                                                        <div className="text-center p-2">
+                                                            <div className="mb-2">
+                                                                <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 onClick={() => handleSubmit(template.template_uid)}
+                                                                        className="btn btn-primary">Activate</button>
+                                                            }
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        ))
+                                    }
+                                    {/* {Object.entries(data)?.map(([key, value]) => (
                                 <div key={key} className="col-xl-6 col-sm-6">
                                     <div className="card card-statistics">
                                         <div className="card-body">
@@ -116,24 +123,25 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                                     </div>
                                 </div>
                             ))} */}
-                        </>
+                                </>
-                        
+
-                        <div className="col-12">
+                                <div className="col-12">
-                            <>
+                                    <>
-                            {handleActivateTemplate.isPending ?
+                                        {handleActivateTemplate.isPending ?
-                            <p className={'text-center '}>loading...</p>
+                                            <p className={'text-center '}>loading...</p>
-                            :
+                                            :
-                            handleActivateTemplate.isError ?
+                                            handleActivateTemplate.isError ?
-                            <p className={'text-center text-danger'}>{handleActivateTemplate.error.message}</p>
+                                                <p className={'text-center text-danger'}>{handleActivateTemplate.error.message}</p>
-                            :
+                                                :
-                            handleActivateTemplate.isSuccess?
+                                                handleActivateTemplate.isSuccess ?
-                            <p className={'text-center text-success'}>Templated activated successfully</p>
+                                                    <p className={'text-center text-success'}>Templated activated
-                            :
+                                                        successfully</p>
-                            null
+                                                    :
-                            }
+                                                    null
-                            </>
+                                        }
-                        </div>
+                                    </>
-                    </div>
+                                </div>
+                            </div>
                     }
                 </div>
             </div>

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>
+
+        <Formik
+            initialValues={initialValues}
+            validationSchema={validationSchema}
+            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" style={{textTransform: 'none'}}>Set your own URL</h4>
+                                </div>
+                            </div>
+                            <div className="card-body">
+                                <div className="form-group">
+                                    <label htmlFor="exampleInputEmail1">Enter your full URL <span
+                                        className={`${(props.errors.url && props.touched.url) && 'text-danger'}`}>{props.errors.url}</span></label>
+                                    <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>
+                                <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>
-                    </div>
+                    </Form>
-                </div>
+                );
-            </div>
+            }}
-        </div>
+        </Formik>
-        <div className="card card-statistics">
+
-            <div className="card-header">
-                <div className="card-heading">
-                    <h4 className="card-title">Default</h4>
-                </div>
-            </div>
-            <div className="card-body">
-                <div className="form-group">
-                    <label htmlFor="exampleInputEmail1">Email address</label>
-                    <input type="email" className="form-control" id="exampleInputEmail1"
-                           aria-describedby="emailHelp" placeholder="Enter your url"/>
-                </div>
-                <button type="submit" className="btn btn-primary">Submit</button>
-            </div>
-        </div>
     </>
 }
 

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -21,7 +21,10 @@ const validationSchema = Yup.object().shape({
         otherwise: (schema) => schema,
     }),
     introduction: Yup.string().min(1, "Minimum 1 character").max(50, "Maximum 50 characters"),
-    url_name: Yup.string().min(6, "Minimum 6 characters").max(16, "Maximum 16 characters").required("Required"),
+    url_name: Yup.string().min(6, "Minimum 6 characters").max(16, "Maximum 16 characters").required("Required").matches(
+    /^[a-zA-Z0-9]+$/, // Regex for alphanumeric characters
+    'Must contain only alphanumeric characters' // Custom error message
+    ),
 })
 
 
@@ -54,7 +57,7 @@ export default function ProfileCompleteCom() {
         mutationFn: (fields) => {
             const {practice, specialization, url_name} = fields
             if (!practice || !specialization || !url_name) {
-                throw new Error('Please select both practice, specialization and Enter URL_Name')
+                throw new Error('Please Select both Practice, Specialization and Enter URL_Name')
             }
             return completeProfile(fields)
         },

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)
+}
+