Merge pull request #2633 from tekdi/release-1.15.0

rushi-tekdi · web-flow · commit af87b18225b2 · 2026-01-30T16:49:24.000+05:30
Release 1.15.0 to teacher dev
diff --git a/apps/admin-app-repo/src/pages/importCsv.tsx b/apps/admin-app-repo/src/pages/importCsv.tsx
@@ -164,7 +164,7 @@ const ImportCsv = () => {
       const userProjectDetailsResponse = await getUserProjectDetails({
         id: courseId,
       });
-      setUserProjectDetails(userProjectDetailsResponse?.result?.tasks);
+      setUserProjectDetails(userProjectDetailsResponse?.result?.tasks?.filter((task: any) => task !== null && task !== undefined) || []);
       if (userProjectDetails?.length) {
       }
       setLoading(false);
diff --git a/apps/admin-app-repo/src/pages/subjectDetails.tsx b/apps/admin-app-repo/src/pages/subjectDetails.tsx
@@ -89,6 +89,30 @@ const SubjectDetails = () => {
   );
   const setBoards = coursePlannerStore((state) => state.setBoards);
 
+  // Clear filters and subjects when board changes to prevent showing data from previous board
+  useEffect(() => {
+    if (boardDetails || boardName) {
+      // Clear all selections
+      setSelectedmedium("");
+      setSelectedgrade("");
+      setSelectedtype("");
+      setSubject([]);
+      setGrade([]);
+      setType([]);
+      
+      // Clear localStorage
+      localStorage.removeItem("selectedMedium");
+      localStorage.removeItem("selectedGrade");
+      localStorage.removeItem("selectedType");
+      localStorage.removeItem("overallCommonSubjects");
+      
+      // Clear taxonomy store
+      setTaxonomyMedium("");
+      setTaxonomyGrade("");
+      setTaxonomyType("");
+    }
+  }, [boardDetails, boardName]);
+
   useEffect(() => {
     const savedMedium = localStorage.getItem("selectedMedium") || "";
     const savedGrade = localStorage.getItem("selectedGrade") || "";
@@ -338,6 +362,14 @@ console.log('matchingSubjects', matchingSubjects);
     }
   }, [tenantConfig, selectedtype]);
 
+  // Clear subjects if any required filter is missing
+  // This ensures subjects are ONLY shown when all 3 filters are selected
+  useEffect(() => {
+    if (!selectedmedium || !selectedgrade || !selectedtype) {
+      setSubject([]);
+    }
+  }, [selectedmedium, selectedgrade, selectedtype]);
+
   // Auto-select medium if only one option is available
   useEffect(() => {
     if (medium.length === 1 && (!selectedmedium || selectedmedium === "")) {
diff --git a/apps/learner-web-app/src/components/Content/Player.tsx b/apps/learner-web-app/src/components/Content/Player.tsx
@@ -57,6 +57,7 @@ const App = ({
   const [breadCrumbs, setBreadCrumbs] = useState<any>();
   const [isShowMoreContent, setIsShowMoreContent] = useState(false);
   const [mimeType, setMemetype] = useState('');
+  const [isVideo, setIsVideo] = useState(false);
   const [isDownloading, setIsDownloading] = useState(false);
   const [showSuccessMessage, setShowSuccessMessage] = useState(false);
   const [showJotFormModal, setShowJotFormModal] = useState(false);
@@ -66,6 +67,31 @@ const App = ({
     mimeType: string;
   } | null>(null);
 
+  const [isPortrait, setIsPortrait] = useState(false);
+
+  useEffect(() => {
+    setIsVideo(mimeType=='video/mp4' || mimeType=='video/webm');
+  }, [mimeType]);
+
+  // Check if device is in portrait mode (width < height)
+  useEffect(() => {
+    const checkOrientation = () => {
+      setIsPortrait(window.innerWidth < window.innerHeight);
+    };
+
+    // Check on mount
+    checkOrientation();
+
+    // Listen for resize and orientation changes
+    window.addEventListener('resize', checkOrientation);
+    window.addEventListener('orientationchange', checkOrientation);
+
+    return () => {
+      window.removeEventListener('resize', checkOrientation);
+      window.removeEventListener('orientationchange', checkOrientation);
+    };
+  }, []);
+
   let activeLink = null;
   if (typeof window !== 'undefined') {
     const searchParams = new URLSearchParams(window.location.search);
@@ -403,9 +429,13 @@ const App = ({
           unitId={unitId}
           mimeType={mimeType}
           {..._config?.player}
+          isPortrait={isPortrait}
+          isVideo={isVideo}
         />
         {item?.content?.artifactUrl &&
+          
           isDownloadableMimeType(item?.content?.mimeType || mimeType) &&
+          (!isPortrait || (isVideo && !isPortrait)) &&
           isDownloadContentEnabled() && (
             <Box
               sx={{
@@ -457,7 +487,8 @@ const App = ({
 
       <Grid
         sx={{
-          display: isShowMoreContent ? 'flex' : 'none',
+          display: isShowMoreContent && (!isPortrait || (isVideo && !isPortrait)) ? 'flex' : 'none',
+
           flexDirection: 'column',
           flex: { xs: 1, sm: 1, md: 9 },
         }}
@@ -615,6 +646,8 @@ const PlayerBox = ({
   trackable,
   isShowMoreContent,
   mimeType,
+  isPortrait,
+  isVideo
 }: any) => {
   const router = useRouter();
   const { t } = useTranslation();
@@ -696,6 +729,7 @@ const PlayerBox = ({
             width: isShowMoreContent
               ? '100%'
               : { xs: '100%', sm: '100%', md: '90%', lg: '80%', xl: '70%' },
+            ...(isPortrait && isVideo ? { p:0, ml:-10, mr:-5 } : {}),
           }}
         >
           <iframe
@@ -718,8 +752,8 @@ const PlayerBox = ({
               aspectRatio: getAspectRatio(),
             }}
             allowFullScreen
-            width="100%"
-            height="100%"
+            width={isPortrait && isVideo ? "110%" : "100%"}
+            height={isPortrait && isVideo ? '300%' : '100%'}
             title="Embedded Localhost"
             allow="accelerometer; gyroscope; autoplay; encrypted-media; picture-in-picture"
             frameBorder="0"
diff --git a/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx b/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx
@@ -302,13 +302,34 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
             
             // Add family member fields to ui:order if it exists
             // They will be hidden initially and DynamicForm will show the appropriate one
+            // Insert them right after family_member_details for proper ordering
             if (alterUISchema['ui:order']) {
               const fieldsToAdd = ['father_name', 'mother_name', 'spouse_name'];
-              fieldsToAdd.forEach((field) => {
-                if (!alterUISchema['ui:order'].includes(field)) {
-                  alterUISchema['ui:order'].push(field);
-                }
-              });
+              const familyMemberDetailsIndex = alterUISchema['ui:order'].indexOf('family_member_details');
+              
+              if (familyMemberDetailsIndex !== -1) {
+                // First, remove the fields if they already exist in the order
+                fieldsToAdd.forEach((field) => {
+                  const existingIndex = alterUISchema['ui:order'].indexOf(field);
+                  if (existingIndex !== -1) {
+                    alterUISchema['ui:order'].splice(existingIndex, 1);
+                  }
+                });
+                
+                // Then insert fields right after family_member_details in the correct order
+                let insertPosition = alterUISchema['ui:order'].indexOf('family_member_details') + 1;
+                fieldsToAdd.forEach((field) => {
+                  alterUISchema['ui:order'].splice(insertPosition, 0, field);
+                  insertPosition++; // Increment position for next field
+                });
+              } else {
+                // Fallback: add at the end if family_member_details not found in order
+                fieldsToAdd.forEach((field) => {
+                  if (!alterUISchema['ui:order'].includes(field)) {
+                    alterUISchema['ui:order'].push(field);
+                  }
+                });
+              }
             }
           }
           setAddSchema(alterSchema);
diff --git a/apps/learner-web-app/src/utils/helper.ts b/apps/learner-web-app/src/utils/helper.ts
@@ -33,7 +33,7 @@ export const mapUserData = (userData: any) => {
     const getSingleSelectedValue = (label: any) =>
       userData.customFields
         .find((f: any) => f.label === label)
-        ?.selectedValues[0]?.id?.toString() || '';
+        ?.selectedValues[0]?.id?.toString() || userData.customFields.find((f: any) => f.label === label)?.selectedValues[0]?.value?.toString() || '';
 
     const getSingleTextValue = (label: any) =>
       userData.customFields.find((f: any) => f.label === label)
@@ -54,11 +54,13 @@ export const mapUserData = (userData: any) => {
                             spouse_name: getSingleTextValue('SPOUSE_NAME'),
 
 
+
       marital_status: getSelectedValue('MARITAL_STATUS'),
       phone_type_accessible
 : getSingleSelectedValue('TYPE_OF_PHONE_ACCESSIBLE'),
     family_member_details
 : getSingleSelectedValue('FAMILY_MEMBER_DETAILS'),
+training_check: getSingleSelectedValue('HAVE_YOU_RECEIVE_ANY_PRIOR_TRAINING'),
       own_phone_check: getSingleSelectedValue('DOES_THIS_PHONE_BELONG_TO_YOU'),
       state: getSelectedValue('STATE'),
       district: getSelectedValue('DISTRICT'),
@@ -74,8 +76,7 @@ export const mapUserData = (userData: any) => {
         getSelectedValue(
           'WHAT_IS_YOUR_PRIMARY_WORK'
         ) || [],
-      training_check:
-        getSelectedValue('HAVE_YOU_RECEIVE_ANY_PRIOR_TRAINING') || [],
+   
       what_do_you_want_to_become: getSingleTextValue(
         'WHAT_DO_YOU_WANT_TO_BECOME'
       ),
diff --git a/mfes/players/src/components/players/SunbirdVideoPlayer.tsx b/mfes/players/src/components/players/SunbirdVideoPlayer.tsx

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ const ImportCsv = () => {`
`164`	`164`	`const userProjectDetailsResponse = await getUserProjectDetails({`
`165`	`165`	`id: courseId,`
`166`	`166`	`});`
`167`		`- setUserProjectDetails(userProjectDetailsResponse?.result?.tasks);`
	`167`	`+ setUserProjectDetails(userProjectDetailsResponse?.result?.tasks?.filter((task: any) => task !== null && task !== undefined) \|\| []);`
`168`	`168`	`if (userProjectDetails?.length) {`
`169`	`169`	`}`
`170`	`170`	`setLoading(false);`