Merge pull request #2512 from tekdi/feat-lead-mapping-new

rushi-tekdi · web-flow · commit 2cc94cb3580b · 2026-01-06T19:15:50.000+05:30
Feat lead mapping new to qa feat
diff --git a/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx b/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx
@@ -17,7 +17,7 @@ import settingImage from '../../../public/images/settings.png';
 import Image from 'next/image';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import { useRouter } from 'next/navigation';
-import { getUserDetails } from '@learner/utils/API/userService';
+import { getUserDetails, getMentorList } from '@learner/utils/API/userService';
 import { Loader, useTranslation } from '@shared-lib';
 import { isUnderEighteen, toPascalCase } from '@learner/utils/helper';
 import { isUndefined } from 'lodash';
@@ -43,6 +43,8 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
   const { t } = useTranslation();
   const [selectedOption, setSelectedOption] = useState('');
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+  const [villageId, setVillageId] = useState<number | null>(null);
+  const [mentorData, setMentorData] = useState<any>(null);
   const tenantName =
     typeof window !== 'undefined'
       ? localStorage.getItem('userProgram') || ''
@@ -65,8 +67,7 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
   if (storedConfig?.isEditProfile) {
     options.push(t('LEARNER_APP.USER_PROFILE_CARD.EDIT_PROFILE'));
   }
-  if(!storedConfig?.restrictChangePassword)
-  {
+  if (!storedConfig?.restrictChangePassword) {
     options.push(t('LEARNER_APP.USER_PROFILE_CARD.CHANGE_PASSWORD'));
   }
   const isBelow18 = (dob: string): boolean => {
@@ -91,6 +92,12 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
         const userId = localStorage.getItem('userId');
         if (userId) {
           const useInfo = await getUserDetails(userId, true);
+          const extractedVillageId =
+            useInfo?.result?.userData?.customFields?.find(
+              (f: any) => f.label === 'VILLAGE'
+            )?.selectedValues?.[0]?.id ?? null;
+          setVillageId(extractedVillageId);
+          // console.log('villageId!!!!!!!!', extractedVillageId);
           console.log('useInfo', useInfo?.result?.userData);
           setUserData(useInfo?.result?.userData);
         }
@@ -102,6 +109,43 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
     fetchUserData();
   }, []);
 
+  useEffect(() => {
+    const fetchMentorData = async () => {
+      try {
+        if (villageId) {
+          const mentorResponse = await getMentorList({
+            limit: 100,
+            filters: {
+              working_village: [String(villageId)],
+              role: 'Mobilizer',
+            },
+            sort: ['createdAt', 'asc'],
+            offset: 0,
+          });
+
+          // Handle different possible response structures
+          const mentorList =
+            mentorResponse?.getUserDetails ||
+            mentorResponse?.userDetails ||
+            mentorResponse?.results ||
+            [];
+
+          // Get the first mentor from the list if available
+          if (Array.isArray(mentorList) && mentorList.length > 0) {
+            setMentorData(mentorList[0]);
+          } else {
+            setMentorData(null);
+          }
+        }
+      } catch (error) {
+        console.error('Error fetching mentor data:', error);
+        setMentorData(null);
+      }
+    };
+
+    fetchMentorData();
+  }, [villageId]);
+
   const handleSettingsClick = (event: React.MouseEvent<HTMLElement>) => {
     setAnchorEl(event.currentTarget);
   };
@@ -335,42 +379,46 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
           maxWidth: { maxWidth },
         }}
       >
-        {!isUnderEighteen(dob)  ? ( 
-          ((mobile !== '-' && mobile)|| (phoneOwnership !== '-' && tenantName !== TenantName.CAMP_TO_CLUB && phoneOwnership !== 'No'))&&
-          <>
-            <Typography sx={sectionTitleStyle}>
-              {t('LEARNER_APP.USER_PROFILE_CARD.CONTACT_INFORMATION')}
-            </Typography>
-            <Box sx={sectionCardStyle}>
-              {/* <Box sx={{ mb: 1.5 }}>
+        {!isUnderEighteen(dob) ? (
+          ((mobile !== '-' && mobile) ||
+            (phoneOwnership !== '-' &&
+              tenantName !== TenantName.CAMP_TO_CLUB &&
+              phoneOwnership !== 'No')) && (
+            <>
+              <Typography sx={sectionTitleStyle}>
+                {t('LEARNER_APP.USER_PROFILE_CARD.CONTACT_INFORMATION')}
+              </Typography>
+              <Box sx={sectionCardStyle}>
+                {/* <Box sx={{ mb: 1.5 }}>
             <Typography sx={labelStyle}>
               {t('LEARNER_APP.USER_PROFILE_CARD.EMAIL_ADDRESS')}
             </Typography>
             <Typography sx={valueStyle}>{email || '-'}</Typography>
           </Box> */}
 
-              <Grid container spacing={1.5}>
+                <Grid container spacing={1.5}>
                 {mobile !== '-' && mobile &&  (
-                  <Grid item xs={6}>
-                    <Typography sx={labelStyle}>
-                      {t('LEARNER_APP.USER_PROFILE_CARD.PHONE_NUMBER')}
-                    </Typography>
-                    <Typography sx={valueStyle}>{mobile}</Typography>
-                  </Grid>
-                )}
+                    <Grid item xs={6}>
+                      <Typography sx={labelStyle}>
+                        {t('LEARNER_APP.USER_PROFILE_CARD.PHONE_NUMBER')}
+                      </Typography>
+                      <Typography sx={valueStyle}>{mobile}</Typography>
+                    </Grid>
+                  )}
                 {phoneOwnership !== '-' && tenantName !== TenantName.CAMP_TO_CLUB && (
-                  <Grid item xs={6}>
-                    <Typography sx={labelStyle}>
+                      <Grid item xs={6}>
+                        <Typography sx={labelStyle}>
                       {t('LEARNER_APP.USER_PROFILE_CARD.PHONE_BELONGS_TO_YOU')}
-                    </Typography>
-                    <Typography sx={valueStyle}>
-                      {toPascalCase(phoneOwnership)}
-                    </Typography>
-                  </Grid>
-                )}
-              </Grid>
-            </Box>
-          </>
+                        </Typography>
+                        <Typography sx={valueStyle}>
+                          {toPascalCase(phoneOwnership)}
+                        </Typography>
+                      </Grid>
+                    )}
+                </Grid>
+              </Box>
+            </>
+          )
         ) : (
           <>
             <Typography sx={sectionTitleStyle}>
@@ -510,15 +558,15 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
                 )}
 
                 {qualification !== '-' && tenantName !== TenantName.CAMP_TO_CLUB && (
-                  <Grid item xs={6}>
-                    <Typography sx={labelStyle}>
+                    <Grid item xs={6}>
+                      <Typography sx={labelStyle}>
                       {t('LEARNER_APP.USER_PROFILE_CARD.HIGHEST_QUALIFICATION')}
-                    </Typography>
-                    <Typography sx={valueStyle}>
+                      </Typography>
+                      <Typography sx={valueStyle}>
                       {t(`FORM.${qualification}`, { defaultValue: qualification })}
-                    </Typography>
-                  </Grid>
-                )}
+                      </Typography>
+                    </Grid>
+                  )}
                 {[state, district, block, village].filter(Boolean).join(', ') !==
                   '-, -, -, -' && (
                   <Grid item xs={12}>
@@ -535,6 +583,50 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
           </>
         )}
 
+      {/* TODO: Add condition based on smart classroom show mentor details */}
+      {/* My Mentor Details */}
+        {mentorData && (
+          <>
+            <Typography sx={sectionTitleStyle}>
+              {t('LEARNER_APP.USER_PROFILE_CARD.MY_MENTOR_DETAILS')}
+            </Typography>
+            <Box sx={sectionCardStyle}>
+              <Grid container spacing={1.5}>
+                {mentorData.firstName || mentorData.lastName ? (
+                  <Grid item xs={6}>
+                    <Typography sx={labelStyle}>
+                      {t('LEARNER_APP.USER_PROFILE_CARD.MENTOR_NAME')}
+                    </Typography>
+                    <Typography sx={valueStyle}>
+                      {toPascalCase(
+                        [mentorData.firstName, mentorData.lastName]
+                          .filter(Boolean)
+                          .join(' ')
+                      )}
+                    </Typography>
+                  </Grid>
+                ) : null}
+                {mentorData.email && (
+                  <Grid item xs={6}>
+                    <Typography sx={labelStyle}>
+                      {t('LEARNER_APP.USER_PROFILE_CARD.MENTOR_EMAIL')}
+                    </Typography>
+                    <Typography sx={valueStyle}>{mentorData.email}</Typography>
+                  </Grid>
+                )}
+                {mentorData.mobile && (
+                  <Grid item xs={6}>
+                    <Typography sx={labelStyle}>
+                      {t('LEARNER_APP.USER_PROFILE_CARD.PHONE_NUMBER')}
+                    </Typography>
+                    <Typography sx={valueStyle}>{mentorData.mobile}</Typography>
+                  </Grid>
+                )}
+              </Grid>
+            </Box>
+          </>
+        )}
+
         {priorTraining !== '-' && currentWork !== '-' && futureWork !== '-' && (
           <>
             <Typography sx={sectionTitleStyle}>
diff --git a/apps/learner-web-app/src/utils/API/userService.ts b/apps/learner-web-app/src/utils/API/userService.ts
@@ -46,31 +46,30 @@ export const userCheck = async ({
 function setLocalStorageFromCustomFields(fields: any) {
   const getFieldId = (labelKey: any) => {
     const field = fields?.find?.((f: any) => f.label === labelKey);
-    console.log("statename",field?.selectedValues?.[0]?.value )  
-  //  localStorage.setItem("stateName", field?.selectedValues?.[0]?.value)
-     return field?.selectedValues?.[0]?.id ?? null;
+    console.log('statename', field?.selectedValues?.[0]?.value);
+    //  localStorage.setItem("stateName", field?.selectedValues?.[0]?.value)
+    return field?.selectedValues?.[0]?.id ?? null;
   };
-   const getFieldLabel = (labelKey: any) => {
+  const getFieldLabel = (labelKey: any) => {
     const field = fields?.find?.((f: any) => f.label === labelKey);
-    console.log("statename",field?.selectedValues?.[0]?.value )  
+    console.log('statename', field?.selectedValues?.[0]?.value);
     // localStorage.setItem("stateName", field?.selectedValues?.[0]?.value)
-     return field?.selectedValues?.[0]?.value ?? null;
+    return field?.selectedValues?.[0]?.value ?? null;
   };
 
   const stateId = getFieldId('STATE');
-  const stateName=getFieldLabel('STATE')
+  const stateName = getFieldLabel('STATE');
   const districtId = getFieldId('DISTRICT');
   const blockId = getFieldId('BLOCK');
 
-  if (stateId) 
-    {localStorage.setItem('mfe_state', String(stateId));
-      localStorage.setItem('stateId', String(stateId));
-    }
+  if (stateId) {
+    localStorage.setItem('mfe_state', String(stateId));
+    localStorage.setItem('stateId', String(stateId));
+  }
   if (districtId) localStorage.setItem('mfe_district', String(districtId));
-  if(stateName)  localStorage.setItem("stateName", stateName)
+  if (stateName) localStorage.setItem('stateName', stateName);
   if (blockId) localStorage.setItem('mfe_block', String(blockId));
-  localStorage.setItem('roleName' , "Learner")
-
+  localStorage.setItem('roleName', 'Learner');
 }
 
 export const profileComplitionCheck = async (): Promise<any> => {
@@ -116,7 +115,8 @@ export const profileComplitionCheck = async (): Promise<any> => {
       console.log('result', result);
       delete result?.properties?.is_volunteer;
 
-const isPropertiesEmpty = Object.keys(result?.properties || {}).length === 0;
+      const isPropertiesEmpty =
+        Object.keys(result?.properties || {}).length === 0;
       return isPropertiesEmpty;
     }
   } catch (error) {
@@ -132,7 +132,11 @@ export const updateUser = async (
   const apiUrl: string = API_ENDPOINTS.userUpdate(userId);
 
   try {
-    const response = await patch(apiUrl, { userData, customFields }, {tenantid: localStorage.getItem('tenantId')});
+    const response = await patch(
+      apiUrl,
+      { userData, customFields },
+      { tenantid: localStorage.getItem('tenantId') }
+    );
     return response;
   } catch (error) {
     console.error('error in fetching user details', error);
@@ -147,7 +151,9 @@ export const getUserDetails = async (
   // apiUrl = fieldValue ? `${apiUrl}?fieldvalue=true` : apiUrl;
 
   try {
-    const response = await get(apiUrl, {tenantid: localStorage.getItem('tenantId')});
+    const response = await get(apiUrl, {
+      tenantid: localStorage.getItem('tenantId'),
+    });
     return response?.data;
   } catch (error) {
     console.error('error in fetching user details', error);
@@ -164,3 +170,38 @@ export const userNameExist = async (userData: any): Promise<any> => {
     throw error;
   }
 };
+
+export interface MentorListParams {
+  limit?: number;
+  filters?: {
+    working_village?: string[];
+    role?: string;
+  };
+  sort?: string[];
+  offset?: number;
+}
+
+export const getMentorList = async ({
+  limit = 100,
+  filters,
+  sort = ['createdAt', 'asc'],
+  offset = 0,
+}: MentorListParams): Promise<any> => {
+  const apiUrl: string = API_ENDPOINTS.userList;
+  try {
+    const response = await post(
+      apiUrl,
+      {
+        limit,
+        filters,
+        sort,
+        offset,
+      },
+      {}
+    );
+    return response?.data?.result;
+  } catch (error) {
+    console.error('error in getting mentor list', error);
+    throw error;
+  }
+};
diff --git a/libs/shared-lib-v2/src/lib/context/locales/en.json b/libs/shared-lib-v2/src/lib/context/locales/en.json
@@ -355,7 +355,10 @@
       "GUARDIAN_NAME": "Guardian's Name",
       "GUARDIAN_DETAILS": "Guardian Details",
       "I_WANT_TO_BECOME": "I want to become {futureWork}",
-      "PTM_NAME": "PTM Name"
+      "PTM_NAME": "PTM Name",
+      "MY_MENTOR_DETAILS": "My Mentor Details",
+      "MENTOR_NAME": "Mentor Name",
+      "MENTOR_EMAIL": "Mentor Email"
     },
     "USERNAME_SUGGESTION": {
       "USERNAME": "Username",
