Merge pull request #2908 from tekdi/prod-fix-23-apr

rushi-tekdi · web-flow · commit 8d46402ea017 · 2026-04-24T13:20:26.000+05:30
Prod fix 23 apr to teacher prod
diff --git a/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx b/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx
@@ -172,6 +172,7 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
         delete responseFormForEnroll?.schema?.properties?.ptm_id;
         delete responseFormForEnroll?.schema?.properties?.poc_id;
         delete responseFormForEnroll?.schema?.properties?.org_id;
+        delete responseFormForEnroll?.schema?.properties?.what_do_you_want_to_become;
         responseFormForEnroll?.schema?.required?.pop('batch');
         console.log('responseFormForEnroll', responseFormForEnroll?.schema);
 
@@ -200,6 +201,9 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
         delete responseForm?.schema?.properties?.ptm_id;
         delete responseForm?.schema?.properties?.poc_id;
         delete responseForm?.schema?.properties?.org_id;
+        delete responseForm?.schema?.properties?.consent_file;
+        delete responseForm?.schema?.properties?.what_do_you_want_to_become;
+
 
         responseForm?.schema?.required.pop('batch');
         let userId = localStorage.getItem('userId');
@@ -233,6 +237,10 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
             responseForm?.schema,
             useInfo?.result?.userData
           );
+          delete updatedSchema?.properties?.consent_file;
+          delete updatedSchema?.properties?.what_do_you_want_to_become;
+
+
           const updatedSchemaForEnroll = getMissingFields(
             responseFormForEnroll?.schema,
             useInfo?.result?.userData
diff --git a/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx b/apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx
@@ -698,7 +698,7 @@ console.log('######### updateUserResponse', updateUserResponse);
 
   // Group fields into sections
   const contactFields = ['mobile', 'phone_type_accessible', 'own_phone_check', 'parent_phone', 'guardian_name', 'guardian_relation'];
-  const personalFields = ['firstName', 'middleName', 'lastName', 'dob', 'gender', 'class', 'marital_status', 'state', 'district', 'block', 'village', 'mother_name', 'father_name', 'spouse_name', 'family_member_details'];
+  const personalFields = ['firstName', 'middleName', 'lastName', 'dob', 'gender', 'class', 'marital_status', 'state', 'district', 'block', 'village', 'mother_name', 'father_name', 'spouse_name', 'family_member_details', 'enrollmentId'];
 
   const getSectionFields = (sectionFieldNames: string[]) => {
     return displayFields.filter((field) => sectionFieldNames.includes(field.name));
@@ -732,6 +732,16 @@ console.log('######### updateUserResponse', updateUserResponse);
   const personalFieldsFiltered = personalSectionFields.filter(
     (field) => !['state', 'district', 'block', 'village', 'firstName', 'middleName', 'lastName'].includes(field.name)
   );
+
+  // enrollmentId is a core field not present in form schema, inject it manually if it exists
+  if (userData.enrollmentId && !personalFieldsFiltered.some((f) => f.name === 'enrollmentId') && localStorage.getItem('userProgram')==="Vocational Training") {
+    personalFieldsFiltered.push({
+      name: 'enrollmentId',
+      schema: { coreField: 1, title: 'Enrollment Id' },
+      value: String(userData.enrollmentId),
+      rawValue: userData.enrollmentId,
+    });
+  }
   {console.log('personalFieldsFiltered==========>', personalFieldsFiltered)
     console.log('getLocationFields==========>', getLocationFields())
     console.log('getNameFields==========>', getNameFields())
diff --git a/apps/learner-web-app/src/components/themantic/subHeader/SubHeader.tsx b/apps/learner-web-app/src/components/themantic/subHeader/SubHeader.tsx
@@ -67,7 +67,7 @@ const SubHeader = ({
             ],
           },
           fields: ['contentLanguage'],
-          limit: 200,
+          limit: 1000,
           offset: 0,
         });
 
diff --git a/apps/learner-web-app/src/utils/API/userService.ts b/apps/learner-web-app/src/utils/API/userService.ts
@@ -117,6 +117,8 @@ export const profileComplitionCheck = async (): Promise<any> => {
         delete responseForm?.schema.properties.mobile;
       }
       const result = getMissingFields(responseForm?.schema, userData);
+      delete result?.properties?.what_do_you_want_to_become;
+      delete result?.properties?.consent_file;
       console.log('result', result);
       delete result?.properties?.is_volunteer;
 
diff --git a/mfes/content/src/components/Content/List.tsx b/mfes/content/src/components/Content/List.tsx
@@ -317,23 +317,42 @@ export default function Content(props: Readonly<ContentProps>) {
       // }
       if(props.onTotalCountChange)
       {
-        //console.log("hellooo")
-        // filter.primaryCategory = [
-        //     'Learning Resource','Practice Question Set','Activity','Story'];
-        console.log("filter====>" , filter);
-        resultResponse = await ContentSearch({
-          ...filter,
-          offset: adjustedOffset,
-          limit: adjustedLimit,
-          signal: controller.signal,
-          primaryCategory: ['Course'],
-        });
+        const isCourseType = ['course', 'self'].includes(filter.type?.toLowerCase() || '');
+        if (isCourseType) {
+          resultResponse = await ContentSearch({
+            ...filter,
+            offset: adjustedOffset,
+            limit: adjustedLimit,
+            signal: controller.signal,
+            primaryCategory: ['Course'],
+          });
+          const resultResponse2 = await ContentSearch({
+            ...filter,
+            offset: adjustedOffset,
+            limit: adjustedLimit,
+            signal: controller.signal,
+            isPrimaryCategory: true,
+            primaryCategory: [
+              'Learning Resource','Practice Question Set','Activity','Story','Interactive'],
+          });
+          setTotalCount(resultResponse2?.result?.count);
+        } else {
+          resultResponse = await ContentSearch({
+            ...filter,
+            offset: adjustedOffset,
+            limit: adjustedLimit,
+            signal: controller.signal,
+            isPrimaryCategory: true,
+            primaryCategory: [
+              'Learning Resource','Practice Question Set','Activity','Story','Interactive'],
+          });
+          setTotalCount(resultResponse?.result?.count);
+        }
       }
-      else{    
+      else{
         const program = searchParams.get('program');
         const search = searchParams.get('q');
 
-        
         if(program || (search && (tab === '0' || tab === null)))
         {
           resultResponse = await ContentSearch({
@@ -344,48 +363,28 @@ export default function Content(props: Readonly<ContentProps>) {
             isPrimaryCategory: true,
             primaryCategory: [
               'Learning Resource','Practice Question Set','Activity','Story' ,'Interactive']
-          });        }
+          });
+        }
         else{
-
-        resultResponse = await ContentSearch({
-          ...filter,
-          offset: adjustedOffset,
-          limit: adjustedLimit,
-          signal: controller.signal,
-        });
-      }
-      }
-      
-
-      if(props.onTotalCountChange) {
-         console.log("hellooo")
-        // filter.primaryCategory = [
-        //     'Learning Resource','Practice Question Set','Activity','Story'];
-        console.log("filter====>" , filter);
-       const resultResponse2 = await ContentSearch({
-          ...filter,
-          offset: adjustedOffset,
-          limit: adjustedLimit,
-          signal: controller.signal,
-          isPrimaryCategory: true,
-          primaryCategory: [
-            'Learning Resource','Practice Question Set','Activity','Story' ,'Interactive'],
-        });
-
-        setTotalCount(resultResponse2?.result?.count);
+          resultResponse = await ContentSearch({
+            ...filter,
+            offset: adjustedOffset,
+            limit: adjustedLimit,
+            signal: controller.signal,
+          });
+        }
       }
         if(props.setTotalResources && resultResponse?.result?.count)
         {
           props.setTotalResources(resultResponse?.result?.count);
         }
      
       
-
+console.log('API response for content search:', resultResponse);
       const response = resultResponse?.result;
       if (props?._config?.getContentData) {
         props._config.getContentData(response);
       }
-
       content.push(...(response?.content || []));
       QuestionSet.push(...(response?.QuestionSet || []));
       count = response?.count || 0;
@@ -523,6 +522,7 @@ export default function Content(props: Readonly<ContentProps>) {
      setIsLoading(true);
       try {
         const response = await fetchAllContent(localFilters);
+        console.log('Content response:', response);
         if (!response || !isMounted) return;
         const newContentData = [
           ...(response.content ?? []),
diff --git a/mfes/youthNet/src/components/youthNet/Profile.tsx b/mfes/youthNet/src/components/youthNet/Profile.tsx
@@ -3,6 +3,7 @@ import { Card, CardContent, Typography, Grid } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { Role } from '../../utils/app.constant';
+import { TENANT_DATA } from '../../utils/app.config';
 
 interface ProfileDetailsProps {
   fullName: string;
@@ -23,6 +24,7 @@ interface ProfileDetailsProps {
   firstName?: string | null;
   lastName?: string | null;
   workingVillages?: string | null;
+  enrollmentId?: string | null;
 }
 
 const Profile: React.FC<ProfileDetailsProps> = ({
@@ -44,6 +46,7 @@ const Profile: React.FC<ProfileDetailsProps> = ({
   firstName,
   lastName,
   workingVillages,
+  enrollmentId,
 }) => {
   const { t } = useTranslation();
   const theme = useTheme<any>();
@@ -56,7 +59,8 @@ const Profile: React.FC<ProfileDetailsProps> = ({
     }
   }, []);
 
-  const isPragyanpath = userProgram === 'Pragyanpath';
+  const isPragyanpath = userProgram === TENANT_DATA.PRAGYANPATH;
+  const isVocationalTraining = userProgram === TENANT_DATA.YOUTHNET;
 
   console.log('designation', designation);
   return (
@@ -338,6 +342,24 @@ const Profile: React.FC<ProfileDetailsProps> = ({
               </Typography>
             </Grid>
           )}
+
+          {designation === Role.LEARNER && isVocationalTraining && (
+            <Grid item xs={6}>
+              <Typography
+                color={theme.palette.warning['500']}
+                sx={{ fontSize: '12px', fontWeight: 600, mt: 2 }}
+              >
+                {t('YOUTHNET_PROFILE.ENROLLMENT_ID', { defaultValue: 'Enrollment ID' })}
+              </Typography>
+              <Typography
+                color={theme.palette.warning['A200']}
+                sx={{ fontSize: '16px', fontWeight: 400 }}
+                gutterBottom
+              >
+                {enrollmentId || "-"}
+              </Typography>
+            </Grid>
+          )}
         </Grid>
       </CardContent>
     </Card>
diff --git a/mfes/youthNet/src/pages/user-profile/[userId].tsx b/mfes/youthNet/src/pages/user-profile/[userId].tsx
@@ -62,6 +62,7 @@ const UserId = () => {
     userName?: string | null;
     joinedOn?: string | null;
     workingVillages?: string | null;
+    enrollmentId?: string | null;
   }>({
     userRole: null,
     userID: null,
@@ -79,6 +80,7 @@ const UserId = () => {
     userName: null,
     joinedOn: null,
     workingVillages: null,
+    enrollmentId: null,
   });
 
   // Get current user ID and userProgram from localStorage on mount
@@ -460,7 +462,6 @@ const UserId = () => {
               ? toPascalCase(role)
               : (
                   getRoleFromTenant() ||
-                  localStorage.getItem('roleName') ||
                   toPascalCase(userData?.tenantData?.[0]?.roles?.[0]?.roleName) ||
                   toPascalCase(role)
                 ),
@@ -470,6 +471,7 @@ const UserId = () => {
           state: getFieldValue('STATE'),
           village: getFieldValue('VILLAGE'),
           workingVillages: getWorkingVillages(),
+          enrollmentId: userData?.enrollmentId || null,
         });
       }
     };
@@ -617,6 +619,7 @@ const UserId = () => {
             firstName={user.firstName || ''}
             lastName={user.lastName || ''}
             workingVillages={user.workingVillages || null}
+            enrollmentId={user.enrollmentId || null}
           />
         </Box>
         <Button

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ export const profileComplitionCheck = async (): Promise<any> => {`
`117`	`117`	`delete responseForm?.schema.properties.mobile;`
`118`	`118`	`}`
`119`	`119`	`const result = getMissingFields(responseForm?.schema, userData);`
	`120`	`+ delete result?.properties?.what_do_you_want_to_become;`
	`121`	`+ delete result?.properties?.consent_file;`
`120`	`122`	`console.log('result', result);`
`121`	`123`	`delete result?.properties?.is_volunteer;`
`122`	`124`