Merge pull request #2690 from tekdi/release-1.15.0

rushi-tekdi · web-flow · commit f10afecb7268 · 2026-02-11T19:09:59.000+05:30
Release 1.15.0 to admin dev
diff --git a/apps/admin-app-repo/src/components/BatchFlow/BatchFlow.tsx b/apps/admin-app-repo/src/components/BatchFlow/BatchFlow.tsx
@@ -149,20 +149,21 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
     // Modify batch_type based on centerType
     if (centerType && alterSchema?.properties?.batch_type) {
       if (centerType === 'remote') {
-        // For remote center: show only "remote" option
-        alterSchema.properties.batch_type.enum = ['remote'];
-        alterSchema.properties.batch_type.enumNames = ['REMOTE'];
+        // For remote center: show "remote" and "hybrid" options
+        alterSchema.properties.batch_type.enum = ['remote', 'hybrid'];
+        alterSchema.properties.batch_type.enumNames = ['REMOTE', 'HYBRID'];
         alterSchema.properties.batch_type.default = 'remote';
-        if (alterUiSchema?.batch_type) {
-          alterUiSchema.batch_type['ui:disabled'] = true;
-        }
-      } else if (centerType === 'regular') {
-        // For regular center: show only "regular" and "contact" options
-        alterSchema.properties.batch_type.enum = ['regular', 'contact'];
-        alterSchema.properties.batch_type.enumNames = ['REGULAR', 'CONTACT'];
         if (alterUiSchema?.batch_type?.['ui:disabled']) {
           delete alterUiSchema.batch_type['ui:disabled'];
         }
+      } else if (centerType === 'regular') {
+        // For regular center: show only "regular" option (disabled)
+        alterSchema.properties.batch_type.enum = ['regular'];
+        alterSchema.properties.batch_type.enumNames = ['REGULAR'];
+        alterSchema.properties.batch_type.default = 'regular';
+        if (alterUiSchema?.batch_type) {
+          alterUiSchema.batch_type['ui:disabled'] = true;
+        }
       }
     }
 
@@ -374,8 +375,8 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
         buildSchemaAndUi(true, existingValues);
         let tempFormData = extractMatchingKeys(row, addSchema);
         // Force batch_type to "remote" if centerType is "remote"
-        if (centerType === 'remote') {
-          tempFormData.batch_type = 'remote';
+        if (centerType === 'regular') {
+          tempFormData.batch_type = 'regular';
         }
         setPrefilledAddFormData(tempFormData);
         setIsEdit(true);
diff --git a/apps/admin-app-repo/src/constant/Forms/BatchCreate.js b/apps/admin-app-repo/src/constant/Forms/BatchCreate.js
@@ -118,12 +118,12 @@ export const BatchCreateSchema = {
       enum: [
         'remote',
         'regular',
-        'contact',
+        'hybrid',
       ],
       enumNames: [
         'REMOTE',
         'REGULAR',
-        'CONTACT',
+        'HYBRID',
       ],
     },
   },
diff --git a/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx b/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx
@@ -21,7 +21,7 @@ import Image from 'next/image';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import VisibilityIcon from '@mui/icons-material/Visibility';
 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 { fetchForm } from '@shared-lib-v2/DynamicForm/components/DynamicFormCallback';
@@ -114,6 +114,8 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
   const [isPreviewOpen, setIsPreviewOpen] = useState(false);
   const [previewTitle, setPreviewTitle] = useState<string>('');
+  const [villageId, setVillageId] = useState<number | null>(null);
+  const [mentorData, setMentorData] = useState<Record<string, unknown> | null>(null);
 
   const storedConfig =
     typeof window !== 'undefined'
@@ -177,6 +179,13 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
         console.log('useInfo', userInfoResponse?.result?.userData);
         console.log('responseForm', formResponse);
         
+        // Extract village ID for mentor lookup
+        const extractedVillageId =
+          userInfoResponse?.result?.userData?.customFields?.find(
+            (f: Record<string, unknown>) => f.label === 'VILLAGE'
+          )?.selectedValues?.[0]?.id ?? null;
+        setVillageId(extractedVillageId);
+        
         setUserData(userInfoResponse?.result?.userData);
         setFormSchema(formResponse);
       } catch (error) {
@@ -186,6 +195,45 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
 
     fetchData();
   }, []);
+
+  // Fetch mentor data based on village ID
+  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] as Record<string, unknown>);
+          } 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);
   };
@@ -676,6 +724,49 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
             </Box>
           </>
         )}
+
+        {/* My Mentor Details Section */}
+        {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(
+                        [String(mentorData.firstName || ''), String(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}>{String(mentorData.email)}</Typography>
+                  </Grid>
+                ) : null}
+                {mentorData.mobile ? (
+                  <Grid item xs={6}>
+                    <Typography sx={labelStyle}>
+                      {t('LEARNER_APP.USER_PROFILE_CARD.PHONE_NUMBER')}
+                    </Typography>
+                    <Typography sx={valueStyle}>{String(mentorData.mobile)}</Typography>
+                  </Grid>
+                ) : null}
+              </Grid>
+            </Box>
+          </>
+        )}
       </Box>
 
       <Menu
diff --git a/libs/shared-lib-v2/src/lib/context/locales/en.json b/libs/shared-lib-v2/src/lib/context/locales/en.json
@@ -688,6 +688,7 @@
     "DESIGNATION": "Designation",
     "REGULAR": "Regular",
     "REMOTE": "Remote",
+    "HYBRID": "Hybrid",
     "NOTE_THIS_WILL_BE_CENTER_NAME": "Note : This will be center name",
     "STATE": "State",
     "DISTRICT": "District",
diff --git a/mfes/scp-teacher-repo/src/pages/centers/index.tsx b/mfes/scp-teacher-repo/src/pages/centers/index.tsx
@@ -587,31 +587,22 @@ const CentersPage = () => {
     const ct = (params.centerType || '').toLowerCase();
     if (schema?.properties?.batch_type) {
       if (ct === 'remote') {
-        schema.properties.batch_type.enum = ['remote'];
-        schema.properties.batch_type.enumNames = ['REMOTE'];
+        // For remote center: show "remote" and "hybrid" options
+        schema.properties.batch_type.enum = ['remote', 'hybrid'];
+        schema.properties.batch_type.enumNames = ['Remote', 'Hybrid'];
         schema.properties.batch_type.default = 'remote';
         prefill.batch_type = 'remote';
+        ensureEnabled('batch_type');
+      } else if (ct === 'regular') {
+        // For regular center: show only "regular" option (disabled)
+        schema.properties.batch_type.enum = ['regular'];
+        schema.properties.batch_type.enumNames = ['Regular'];
+        schema.properties.batch_type.default = 'regular';
+        prefill.batch_type = 'regular';
         uiSchema.batch_type = {
           ...(uiSchema?.batch_type || {}),
           'ui:disabled': true,
         };
-      } else if (ct === 'regular') {
-        // Only restrict if enum exists; otherwise leave as-is.
-        const existingEnum = Array.isArray(schema.properties.batch_type.enum)
-          ? schema.properties.batch_type.enum
-          : null;
-        if (existingEnum) {
-          const allowed = ['regular', 'contact'].filter((v) =>
-            existingEnum.includes(v)
-          );
-          if (allowed.length) {
-            schema.properties.batch_type.enum = allowed;
-            schema.properties.batch_type.enumNames = allowed.map((v) =>
-              v.toUpperCase()
-            );
-          }
-        }
-        ensureEnabled('batch_type');
       }
     }
 
diff --git a/mfes/scp-teacher-repo/src/shared/LearnerManage/LearnerManage.tsx b/mfes/scp-teacher-repo/src/shared/LearnerManage/LearnerManage.tsx
@@ -144,7 +144,7 @@ const LearnerManage = ({
 
       const requiredKeys = isReassign
         ? ['state', 'district', 'block']
-        : ['state', 'district', 'block', 'center', 'batch'];
+        : ['center', 'batch']; // Removed 'state', 'district', 'block' to keep them visible
       //set ui schema hide
       const updatedUiSchema = { ...alterUISchema };
       // Clone each key's config and set widget to 'hidden'
@@ -252,9 +252,9 @@ const LearnerManage = ({
           const blockIds = getSelectedValueIds('BLOCK');
           // const villageIds = getSelectedValueIds('VILLAGE');
           initialFormData = {
-            state: stateIds,
-            district: districtIds,
-            block: blockIds,
+            // state: stateIds,
+            // district: districtIds,
+            // block: blockIds,
             // village: villageIds,
             center: [localStorage.getItem('centerId')],
             batch: [cohortId],
diff --git a/mfes/youthNet/src/pages/villages/index.tsx b/mfes/youthNet/src/pages/villages/index.tsx
