Merge remote-tracking branch 'upstream/release-1.15.0' into release-1.15.0

Author: rushi-tekdi

apps/admin-app-repo/public/locales/en/common.json

@@ -173,7 +173,8 @@
     "USER_BATCHES": "{{name}} belongs to below batches",
     "DELETE_FROM_BATCH_WARNING": "Do you want to delete user from above center's batches?",
     "SAVE": "Save",
-    "SAVING": "Saving..."
+    "SAVING": "Saving...",
+    "MAP_NEW": "Map New"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",

apps/admin-app-repo/src/pages/centers.tsx

@@ -69,7 +69,11 @@ const Centers = () => {
   const [firstName, setFirstName] = useState('');
   const [totalCount, setTotalCount] = useState(0);
   const [totalCountBatch, setTotalCountBatch] = useState(0);
-  const storedProgram = localStorage.getItem('program');
+
+  const storedProgram =
+    typeof window !== 'undefined'
+      ? localStorage.getItem('tenantName') ?? localStorage.getItem('program')
+      : null;
 
   const { t, i18n } = useTranslation();
   const initialFormData = localStorage.getItem('stateId')
@@ -130,6 +134,7 @@ const Centers = () => {
         }
       });
       alterSchema.required = requiredArray;
+
       //add max selection custom
       if (alterSchema?.properties?.state) {
         alterSchema.properties.state.maxSelection = 1;
@@ -350,10 +355,16 @@ const Centers = () => {
       key: 'image',
       label: 'Images',
       render: (row: any) => {
-        console.log('Row in image column:', row);
+        const rawImage = row?.image;
+        const images: string[] = Array.isArray(rawImage)
+          ? rawImage
+          : typeof rawImage === 'string' && rawImage
+          ? [rawImage]
+          : [];
+
         return (
           <div style={{ display: 'flex', gap: '8px' }}>
-            {row?.image?.map((imgUrl: string, index: number) => (
+            {images.map((imgUrl: string, index: number) => (
               <img
                 key={index}
                 src={imgUrl}
@@ -491,7 +502,9 @@ const Centers = () => {
         setOpenBatchModal(true);
         // console.log('row in view batch', row);
       },
-      show: (row) => row.status !== 'archived',
+      show: (row) =>
+        row.status !== 'archived' &&
+        storedProgram === TenantName.SECOND_CHANCE_PROGRAM,
     },
     {
       icon: (

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

apps/admin-app-repo/src/pages/user-content-creator.tsx

@@ -574,7 +574,7 @@ const ContentCreator = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}
+            {t('COMMON.MAP_NEW')}
           </Button>
         </Box>
 

apps/admin-app-repo/src/pages/user-content-reviewer.tsx

@@ -583,7 +583,7 @@ const ContentReviewer = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}
+            {t('COMMON.MAP_NEW')}
           </Button>
         </Box>
 

apps/admin-app-repo/src/pages/user-instructor.tsx

@@ -927,7 +927,7 @@ const Facilitator = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}{' '}
+            {t('COMMON.MAP_NEW')}{' '}
           </Button>
         </Box>
 

apps/admin-app-repo/src/pages/user-leader.tsx

@@ -709,7 +709,7 @@ const UserLeader = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}
+            {t('COMMON.MAP_NEW')}
           </Button>
         </Box>
 

apps/admin-app-repo/src/pages/user-mobilizer.tsx

@@ -957,7 +957,7 @@ const Mobilizer = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}
+            {t('COMMON.MAP_NEW')}
           </Button>
         </Box>
 

apps/admin-app-repo/src/pages/user-state-lead.tsx

@@ -490,7 +490,7 @@ const StateLead = () => {
               setMapModalOpen(true);
             }}
           >
-            {t('COMMON.ADD_NEW')}
+            {t('COMMON.MAP_NEW')}
           </Button>
         </Box>
 

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