Merge pull request #2546 from rushi-tekdi/feat-lead-mapping-new

added bacth and center section component

Author: rushi-tekdi

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

@@ -54,6 +54,7 @@ import deleteIcon from '../../public/images/deleteIcon.svg';
 import restoreIcon from '../../public/images/restore_user.svg';
 import CloseIcon from '@mui/icons-material/Close';
 import BatchListWidget from '@shared-lib-v2/MapUser/BatchListWidget';
+import MultipleBatchListWidget from '@shared-lib-v2/MapUser/MultipleBatchListWidget';
 import EmailSearchUser from '@shared-lib-v2/MapUser/EmailSearchUser';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 
@@ -799,6 +800,8 @@ const Facilitator = () => {
   const [selectedCenterId, setSelectedCenterId] = useState<
     string | string[] | null
   >(null);
+  const [selectedCenterList, setSelectedCenterList] = useState<any[]>([]);
+  const [selectedBatchList, setSelectedBatchList] = useState<any[]>([]);
   const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
   const [isMappingInProgress, setIsMappingInProgress] = useState(false);
   const [userDetails, setUserDetails] = useState<any>(null);
@@ -812,6 +815,8 @@ const Facilitator = () => {
 
   // Helper function to extract all batch IDs from the nested structure
   const extractBatchIds = (nestedStructure: any): string[] => {
+    return nestedStructure;
+
     const batchIds: string[] = [];
 
     if (!nestedStructure || !Array.isArray(nestedStructure)) {
@@ -1043,6 +1048,8 @@ const Facilitator = () => {
           if (reason !== 'backdropClick') {
             setMapModalOpen(false);
             setSelectedCenterId(null); // Reset center selection when dialog closes
+            setSelectedCenterList(null); // Reset center list selection when dialog closes
+            setSelectedBatchList(null); // Reset batch selection when dialog closes
             setSelectedUserId(null); // Reset user selection when dialog closes
             setUserDetails(null);
           }
@@ -1132,13 +1139,23 @@ const Facilitator = () => {
           )}
           {formStep === 1 && (
             <Box sx={{ mb: 3 }}>
-              <BatchListWidget
+              <MultipleBatchListWidget
                 value={selectedCenterId}
                 onChange={(centerId) => {
                   setSelectedCenterId(centerId);
                   console.log('Selected Center ID:', centerId);
                 }}
-                label="Select Center"
+                onCenterList={(centerList) => {
+                  setSelectedCenterList(centerList || []);
+                  console.log('############# centerList', centerList);
+                }}
+                selectedCenterList={selectedCenterList}
+                onBatchList={(batchList) => {
+                  setSelectedBatchList(batchList || []);
+                  console.log('############# batchList', batchList);
+                }}
+                selectedBatchList={selectedBatchList}
+                label="Select Batch"
                 required={true}
                 multiple={false}
               />
@@ -1243,6 +1260,8 @@ const Facilitator = () => {
                         // Close dialog
                         setMapModalOpen(false);
                         setSelectedCenterId(null);
+                        setSelectedCenterList(null);
+                        setSelectedBatchList(null);
                         setSelectedUserId(null);
                         // Refresh the data
                         searchData(prefilledFormData, 0);

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

@@ -63,7 +63,7 @@ import CenteredLoader from '@/components/CenteredLoader/CenteredLoader';
 import ResetFiltersButton from '@/components/ResetFiltersButton/ResetFiltersButton';
 import restoreIcon from '../../public/images/restore_user.svg';
 import { showToastMessage } from '@/components/Toastify';
-import CenterListWidget from '@shared-lib-v2/MapUser/CenterListWidget';
+import MultipleCenterListWidgetNew from '@shared-lib-v2/MapUser/MultipleCenterListWidgetNew';
 import EmailSearchUser from '@shared-lib-v2/MapUser/EmailSearchUser';
 import { API_ENDPOINTS } from '@/utils/API/APIEndpoints';
 import { updateUser } from '@/services/CreateUserService';
@@ -576,6 +576,7 @@ const UserLeader = () => {
   const [selectedCenterId, setSelectedCenterId] = useState<
     string | string[] | null
   >(null);
+  const [selectedCenterList, setSelectedCenterList] = useState<any[]>([]);
   const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
   const [isMappingInProgress, setIsMappingInProgress] = useState(false);
   const [userDetails, setUserDetails] = useState<any>(null);
@@ -716,6 +717,7 @@ const UserLeader = () => {
           if (reason !== 'backdropClick') {
             setMapModalOpen(false);
             setSelectedCenterId(null); // Reset center selection when dialog closes
+            setSelectedCenterList([]); // Reset center list when dialog closes
             setSelectedUserId(null); // Reset user selection when dialog closes
             setUserDetails(null);
           }
@@ -805,12 +807,17 @@ const UserLeader = () => {
           )}
           {formStep === 1 && (
             <Box sx={{ mb: 3 }}>
-              <CenterListWidget
+              <MultipleCenterListWidgetNew
                 value={selectedCenterId}
                 onChange={(centerId) => {
                   setSelectedCenterId(centerId);
                   console.log('Selected Center ID:', centerId);
                 }}
+                onCenterList={(centerList) => {
+                  setSelectedCenterList(centerList || []);
+                  console.log('############# centerList', centerList);
+                }}
+                selectedCenterList={selectedCenterList}
                 label="Select Center"
                 required={true}
                 multiple={false}
@@ -915,6 +922,7 @@ const UserLeader = () => {
                         // Close dialog
                         setMapModalOpen(false);
                         setSelectedCenterId(null);
+                        setSelectedCenterList([]);
                         setSelectedUserId(null);
                         // Refresh the data
                         searchData(prefilledFormData, 0);