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

Release 1.13.0 prod register to learner prod

Author: rushi-tekdi

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) {

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);

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)
         );
 

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);
 

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"){