Merge pull request #2454 from tekdi/release-1.13.0-prod-register

rushi-tekdi · web-flow · commit 69225d31c9bf · 2025-12-23T22:54:23.000+05:30
Release 1.13.0 prod register to teacher prod
diff --git a/apps/learner-web-app/src/app/programs/page.tsx b/apps/learner-web-app/src/app/programs/page.tsx
@@ -39,7 +39,9 @@ function ProgramsContent() {
           const enrolledTenantIds = tenantData
             .filter(
               (item: any) =>
-                item.tenantStatus === 'active' && item.tenantName !== 'Pratham'
+                (item.tenantStatus === 'active' ||
+                  item.tenantStatus === 'pending') &&
+                item.tenantName !== 'Pratham'
             )
             .map((item: any) => item.tenantId);
           if (enrolledTenantIds.length > 0) {
diff --git a/apps/learner-web-app/src/components/Content/Player.tsx b/apps/learner-web-app/src/components/Content/Player.tsx
@@ -78,7 +78,8 @@ const App = ({
       console.log('rt=======>', rt);
       const currentPath =
         typeof window !== 'undefined' ? window.location.pathname : '';
-      const isThematicPath = currentPath.includes('/themantic');
+      const hostname = typeof window !== 'undefined' ? window.location.hostname : '';
+      const isThematicPath = currentPath.includes('/themantic')||hostname.includes('experimentoindia');
       const isPosPath = currentPath.includes('/pos');
 
       if (!isThematicPath && !isPosPath && rt?.program) {
@@ -92,12 +93,13 @@ const App = ({
           return;
         }
       }
-      }
       if(localStorage.getItem('channelId')!==rt.channel)
-      {
-        router.push('/unauthorized');
-        return;
+        {
+          router.push('/unauthorized');
+          return;
+        }
       }
+     
 
       const response2 = await ContentSearch({
         filters: {
diff --git a/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx b/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx
@@ -119,6 +119,18 @@ const [responseFormData, setResponseFormData] = useState<any>({});
             },
           },
         ]);
+        delete responseFormForEnroll?.schema?.properties?.password;
+        delete responseFormForEnroll?.schema?.properties.confirm_password;
+        delete responseFormForEnroll?.schema?.properties?.username;
+        delete responseFormForEnroll?.schema?.properties?.program;
+        delete responseFormForEnroll?.schema?.properties?.batch;
+        delete responseFormForEnroll?.schema?.properties?.center;
+        delete responseFormForEnroll?.schema?.properties?.state;
+        delete responseFormForEnroll?.schema?.properties?.district;
+        delete responseFormForEnroll?.schema?.properties?.block;
+        delete responseFormForEnroll?.schema?.properties?.village;
+        responseFormForEnroll?.schema?.required?.pop('batch');
+
         const responseFormCopy = JSON.parse(JSON.stringify(responseForm));
         setResponseFormData(responseFormCopy);
         console.log('responseForm===>', responseFormCopy?.schema);
@@ -159,10 +171,10 @@ const [responseFormData, setResponseFormData] = useState<any>({});
 
           setUserFormData(mappedData);
           //unit name is missing from required so handled from frotnend
-          let alterSchema = uponEnrollCompletion?updatedSchemaForEnroll:completeProfile
+          let alterSchema = enrolledProgram?responseFormForEnroll?.schema:completeProfile
             ? updatedSchema
             : responseForm?.schema;
-          let alterUISchema = responseForm?.uiSchema;
+          let alterUISchema =enrolledProgram? responseFormForEnroll?.uiSchema: responseForm?.uiSchema;
           
           // Set mobile field states
           setMobileAddUiSchema(responseForm?.uiSchema?.mobile);
diff --git a/apps/learner-web-app/src/components/ProgramSwitchModal/ProgramSwitchModal.tsx b/apps/learner-web-app/src/components/ProgramSwitchModal/ProgramSwitchModal.tsx
@@ -53,6 +53,7 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
   const [currentProgram, setCurrentProgram] = useState<TenantData | null>(null);
   const [loading, setLoading] = useState(true);
   const [isAllProgramRegistred, setIsAllProgramRegistred] = useState<string | null>(null);
+  const [userProgram, setUserProgram] = useState<string | null>(null);
 
   useEffect(() => {
     const fetchEnrolledPrograms = async () => {
@@ -61,6 +62,7 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
         const userId = localStorage.getItem('userId');
         const currentTenantId = localStorage.getItem('tenantId');
         const currentProgramName = localStorage.getItem('userProgram');
+        setUserProgram(currentProgramName);
 
         if (!userId) {
           setLoading(false);
@@ -403,7 +405,8 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
           >
             Home
           </Button>
-          {isAllProgramRegistred !== 'yes' && (
+          {(isAllProgramRegistred === 'no' ||
+            (userProgram !== null && userProgram !== 'Pragyanpath')) && (
           <Button
             variant="outlined"
             fullWidth
diff --git a/libs/shared-lib-v2/src/DynamicForm/components/DynamicForm.tsx b/libs/shared-lib-v2/src/DynamicForm/components/DynamicForm.tsx
@@ -315,7 +315,7 @@ const DynamicForm = ({
             });
 
             // remove from required mobile
-            requiredArray = requiredArray.filter(
+            requiredArray = requiredArray?.filter(
               (key) => !requiredKeys2.includes(key)
             );
 
@@ -388,7 +388,7 @@ const DynamicForm = ({
             delete formData?.guardian_name;
 
             // remove from required
-            requiredArray = requiredArray.filter(
+            requiredArray = requiredArray?.filter(
               (key) => !requiredKeys.includes(key)
             );
 
@@ -466,10 +466,10 @@ const DynamicForm = ({
         let requiredArray = oldFormSchema?.required;
 
         // remove from required
-        requiredArray = requiredArray.filter(
+        requiredArray = requiredArray?.filter(
           (key) => !requiredKeys.includes(key)
         );
-        requiredArray = requiredArray.filter(
+        requiredArray = requiredArray?.filter(
           (key) => !requiredKeys2.includes(key)
         );
 
diff --git a/mfes/content/src/components/Card/ContentCardGrid.tsx b/mfes/content/src/components/Card/ContentCardGrid.tsx
@@ -31,6 +31,8 @@ const ContentCardGrid = memo((props: ContentCardGridProps) => {
   const isMd = useMediaQuery(theme.breakpoints.only('md'));
   const isLg = useMediaQuery(theme.breakpoints.only('lg'));
   const isXl = useMediaQuery(theme.breakpoints.up('xl'));
+  const currentPath = typeof window !== 'undefined' ? window.location.pathname : '';
+  const isThematicPath = currentPath.includes('/themantic');
 
   // Calculate items per row based on breakpoints and _grid overrides
   const getItemsPerRow = () => {
@@ -175,8 +177,11 @@ console.log("props.contentData",props.contentData)
             lg={3}
             xl={2.4}
             {..._grid}
-            sx={{ display: 'flex', ...(_grid?.sx ?? {}) }}
-          >
+            sx={{
+              ...(isThematicPath ? { display: 'flex' } : {}),
+              ...(_grid?.sx ?? {}),
+            }}     
+                 >
             <ContentCard
               item={item}
               type={props.type}
diff --git a/mfes/content/src/components/Content/ContentEnroll.tsx b/mfes/content/src/components/Content/ContentEnroll.tsx
@@ -58,8 +58,9 @@ const ContentDetails = (props: ContentDetailsProps) => {
 
 console.log('result=======>', result?.program);
 const currentPath = typeof window !== 'undefined' ? window.location.pathname : '';
+const hostname = typeof window !== 'undefined' ? window.location.hostname : '';
 console.log('currentPath=======>', currentPath);
-const isThematicPath = currentPath.includes('/themantic');
+const isThematicPath = currentPath.includes('/themantic') || hostname.includes('experimentoindia');
 const isPosPath = currentPath.includes('/pos');
 console.log('isThematicPath=======>', isThematicPath);
 
@@ -71,12 +72,14 @@ if(!isThematicPath && !isPosPath && result?.program) {
           router.push('/unauthorized');
           return;
         }
-      }}
-       if(localStorage.getItem('channelId')!==result.channel)
-       {
-        router.push('/unauthorized');
-        return;
-       }
+      } if(localStorage.getItem('channelId')!==result.channel)
+        {
+         router.push('/unauthorized');
+         return;
+        }
+    
+    }
+      
         const userId = getUserId(props?._config?.userIdLocalstorageName);
         setCheckLocalAuth(checkAuth(Boolean(userId)));
         if (props?._config?.isEnrollmentRequired !== false) {
diff --git a/mfes/content/src/components/Content/CourseUnitDetails.tsx b/mfes/content/src/components/Content/CourseUnitDetails.tsx
@@ -77,8 +77,10 @@ export default function Details(props: DetailsProps) {
           mode: 'edit',
         }) as any;
         const currentPath = typeof window !== 'undefined' ? window.location.pathname : '';
-        const isThematicPath = currentPath.includes('/themantic');
+        const hostname = typeof window !== 'undefined' ? window.location.hostname : '';
         const isPosPath = currentPath.includes('/pos');
+        const isThematicPath = currentPath.includes('/themantic')||hostname.includes('experimentoindia');
+
         if(!isThematicPath && !isPosPath && resultHierarchyCourse?.program) {
         console.log('rt=======>', resultHierarchyCourse);
         if(localStorage.getItem('channelId')==="pos-channel"){
diff --git a/mfes/scp-teacher-repo/src/components/UserRegistration/AssignBatchModal.tsx b/mfes/scp-teacher-repo/src/components/UserRegistration/AssignBatchModal.tsx
diff --git a/mfes/scp-teacher-repo/src/services/CohortServices.ts b/mfes/scp-teacher-repo/src/services/CohortServices.ts
