Merge pull request #2302 from tekdi/release-1.13.0-prod

Release 1.13.0 prod

Author: snehal0904

mfes/scp-teacher-repo/src/components/CohortLearnerList.tsx

@@ -24,13 +24,15 @@ interface CohortLearnerListProp {
   reloadState: boolean;
   setReloadState: React.Dispatch<React.SetStateAction<boolean>>;
   isLearnerAdded: boolean;
+  isLearnerReassigned?: boolean;
 }
 
 const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
   cohortId,
   reloadState,
   setReloadState,
   isLearnerAdded,
+  isLearnerReassigned,
 }) => {
   const [loading, setLoading] = React.useState<boolean>(false);
   const [searchTerm, setSearchTerm] = useState('');
@@ -103,19 +105,48 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
       }
     };
     getCohortMemberList();
-  }, [cohortId, reloadState, isLearnerAdded, isLearnerDeleted]);
+  }, [
+    cohortId,
+    reloadState,
+    isLearnerAdded,
+    isLearnerDeleted,
+    isLearnerReassigned,
+  ]);
+
+  // Reapply search filter when userData changes
+  useEffect(() => {
+    if (userData) {
+      const query = searchTerm.toLowerCase().trim();
+      if (!query) {
+        setFilteredData(userData);
+      } else {
+        const filtered = userData.filter(
+          (data) =>
+            data?.name?.toLowerCase()?.includes(query) ||
+            data?.enrollmentNumber?.toLowerCase()?.includes(query)
+        );
+        setFilteredData(filtered);
+      }
+    }
+  }, [userData, searchTerm]);
 
   const handleLearnerDelete = () => {
     setIsLearnerDeleted(true);
   };
-  const handleSearch = (searchTerm: string) => {
-    // const query = event.target.value.toLowerCase();
-    // setSearchQuery(query);
+    const handleSearch = (searchTerm: string) => {
+    setSearchTerm(searchTerm);
+    const query = searchTerm.toLowerCase().trim();
+
+    if (!query) {
+      // If search is empty, show all data
+      setFilteredData(userData);
+      return;
+    }
 
     const filtered = userData?.filter(
       (data) =>
-        data?.name?.toLowerCase()?.includes(searchTerm) ||
-        data?.enrollmentNumber?.toLowerCase()?.includes(searchTerm)
+        data?.name?.toLowerCase()?.includes(query) ||
+        data?.enrollmentNumber?.toLowerCase()?.includes(query)
     );
     setFilteredData(filtered);
   };
@@ -127,7 +158,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
         <Loader showBackdrop={true} loadingText={t('COMMON.LOADING')} />
       ) : (
         <>
-          {filteredData?.length ? (
+          {userData?.length ? (
             <SearchBar
               onSearch={handleSearch}
               value={searchTerm}

mfes/scp-teacher-repo/src/components/LearnersListItem.tsx

@@ -339,6 +339,9 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
   const handleCloseCentersModal = () => {
     setOpenCentersModal(false);
   };
+  const handleLearnerReassigned = () => {
+    setReloadState(!reloadState);
+  };
 
   // const handleAssignCenters = async (selectedCenters: any) => {
   //   setOpenCentersModal(false);
@@ -825,6 +828,7 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
           onClose={handleCloseCentersModal}
           isReassign={true}
           customFields={customFields}
+          onLearnerReassigned={handleLearnerReassigned}
           userId={userId}
         />
       )}

mfes/scp-teacher-repo/src/pages/centers/[cohortId]/index.tsx

@@ -184,6 +184,7 @@ const CohortPage = () => {
   const [state, setState] = React.useState<string>();
   const [clickedBox, setClickedBox] = useState<string | null>(null);
   const [isLearnerAdded, setIsLearnerAdded] = useState(false);
+  const [isLearnerReassigned, setIsLearnerReassigned] = useState(false);
   const [createEvent, setCreateEvent] = useState(false);
   const [eventCreated, setEventCreated] = useState(false);
   const [onEditEvent, setOnEditEvent] = useState(false);
@@ -1146,6 +1147,7 @@ const CohortPage = () => {
                 reloadState={reloadState}
                 setReloadState={setReloadState}
                 isLearnerAdded={isLearnerAdded}
+                isLearnerReassigned={isLearnerReassigned}
               />
             </Box>
             {openAddLearnerModal && (

mfes/scp-teacher-repo/src/shared/LearnerManage/LearnerManage.tsx

@@ -34,6 +34,7 @@ const LearnerManage = ({
   open,
   onClose,
   onLearnerAdded,
+  onLearnerReassigned,
   cohortId,
   isReassign,
   customFields,
@@ -327,6 +328,9 @@ const LearnerManage = ({
               if (typeof onLearnerAdded === 'function') {
                 onLearnerAdded();
               }
+              // if (typeof onLearnerReassign === 'function') {
+                onLearnerReassigned();
+              // }
               setOpenModal(false);
             }}
             schema={isEditProfile ? addEditSchema : addSchema}
@@ -343,6 +347,9 @@ const LearnerManage = ({
               if (typeof onLearnerAdded === 'function') {
                 onLearnerAdded();
               }
+              // if (typeof onLearnerReassign === 'function') {
+                onLearnerReassigned();
+              // }
               setOpenModal(false);
             }}
             extraFields={extraFields}