Merge pull request #2641 from Rushikesh-Sonawane99/release-1.15.0

Issue #PS-000 chore:Fixed center creation issue with incomplete catchment area

Author: rushi-tekdi

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

@@ -134,6 +134,7 @@ const Centers = () => {
         }
       });
       alterSchema.required = requiredArray;
+
       //add max selection custom
       if (alterSchema?.properties?.state) {
         alterSchema.properties.state.maxSelection = 1;
@@ -354,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}

libs/shared-lib-v2/src/DynamicForm/components/RJSFWidget/CatchmentAreaWidget.tsx

@@ -134,8 +134,12 @@ const CatchmentAreaWidget = ({
   options,
 }: WidgetProps) => {
   const { t } = useTranslation();
+  const sanitizeSelectedStates = (input: any): SelectedState[] =>
+    Array.isArray(input)
+      ? (input.filter((s: any) => s && typeof s === 'object') as SelectedState[])
+      : [];
   const [selectedStates, setSelectedStates] = useState<SelectedState[]>(
-    value || []
+    sanitizeSelectedStates(value)
   );
   const [stateSelectValue, setStateSelectValue] = useState('');
   const [districtSelectValues, setDistrictSelectValues] = useState<{
@@ -156,8 +160,10 @@ const CatchmentAreaWidget = ({
   }>({});
 
   // Get available states (not yet selected)
+  const normalizedSelectedStates = sanitizeSelectedStates(selectedStates);
   const availableStates = states.filter(
-    (state) => !selectedStates.some((selected) => selected.stateId === state.id)
+    (state) =>
+      !normalizedSelectedStates.some((selected) => selected.stateId === state.id)
   );
 
   // Fetch states from API
@@ -224,7 +230,7 @@ const CatchmentAreaWidget = ({
   // Handle value prop changes (e.g., form reset, external updates)
   useEffect(() => {
     if (value && JSON.stringify(value) !== JSON.stringify(selectedStates)) {
-      setSelectedStates(value);
+      setSelectedStates(sanitizeSelectedStates(value));
     }
   }, [value]);
 
@@ -482,25 +488,46 @@ const CatchmentAreaWidget = ({
 
   // Check if any states are selected
   const hasSelectedStates = () => {
-    return selectedStates.length > 0;
+    return (
+      normalizedSelectedStates.length > 0 &&
+      normalizedSelectedStates.some((s: any) => s?.stateId || s?.stateName)
+    );
   };
 
+  const isCatchmentComplete = () => {
+    if (!hasSelectedStates()) return false;
+    for (const state of normalizedSelectedStates as any[]) {
+      const districtsArr = Array.isArray(state?.districts) ? state.districts : [];
+      if (districtsArr.length === 0) return false;
+      for (const district of districtsArr) {
+        const blocksArr = Array.isArray(district?.blocks) ? district.blocks : [];
+        if (blocksArr.length === 0) return false;
+      }
+    }
+    return true;
+  };
+
+  const showIncompleteCatchmentMessage = hasSelectedStates() && !isCatchmentComplete();
+
   // Get a string representation of selected states for the hidden input
   const getSelectedStatesString = () => {
-    return selectedStates.map((state) => state.stateName).join(', ');
+    return normalizedSelectedStates
+      .map((state: any) => state?.stateName)
+      .filter(Boolean)
+      .join(', ');
   };
 
   return (
-    <Box sx={{ mb: 3 }}>
-      {rawErrors.length > 0 && (
-        <Typography
-          color="error"
-          variant="caption"
-          sx={{ display: 'block', mb: 1 }}
-        >
-          {rawErrors[0]}
-        </Typography>
-      )}
+    <Box
+      id={id}
+      tabIndex={-1}
+      className={
+        rawErrors.length > 0 || showIncompleteCatchmentMessage
+          ? 'field-error'
+          : undefined
+      }
+      sx={{ mb: 3, outline: 'none' }}
+    >
       {/* State Selection */}
       {loadingStates ? (
         <Box
@@ -549,17 +576,26 @@ const CatchmentAreaWidget = ({
           </FormControl>
         )
       )}
+      {(rawErrors.length > 0 || showIncompleteCatchmentMessage) && (
+        <Typography
+          variant="caption"
+          sx={{ display: 'block', mt: -1, mb: 1, color: '#000' }}
+        >
+          Select at least 1 district and 1 block under each selected state. Also
+          select at least 1 block under each selected district.
+        </Typography>
+      )}
       {/* Hidden text input to force native validation */}
       <input
-        value={hasSelectedStates() ? getSelectedStatesString() : ''}
+        value={isCatchmentComplete() ? getSelectedStatesString() : ''}
         required={required}
         onChange={() => {}}
         tabIndex={-1}
         style={{
           height: 1,
           padding: 0,
           border: 0,
-          ...(hasSelectedStates() && { visibility: 'hidden' }),
+          ...(isCatchmentComplete() && { visibility: 'hidden' }),
         }}
         aria-hidden="true"
       />

libs/shared-lib-v2/src/MapUser/EmailSearchUser.tsx

@@ -358,7 +358,7 @@ const EmailSearchUser: React.FC<EmailSearchUserProps> = ({
           {loading ? (
             <CircularProgress size={24} color="inherit" />
           ) : isUserLoaded ? (
-            t('COMMON.CHANGE_USER')
+            t('COMMON.RESET_USER')
           ) : (
             t('COMMON.FETCH_USER')
           )}

libs/shared-lib-v2/src/MapUser/WorkingVillageAssignmentWidget.tsx

@@ -85,6 +85,7 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
   const themeColor = '#FDBE16';
   const themeColorLight = 'rgba(253, 190, 22, 0.1)'; // 10% opacity
   const themeColorLighter = 'rgba(253, 190, 22, 0.05)'; // 5% opacity
+  const __villagesLoadSeqRef = React.useRef(0);
 
   // Local state management for geography filters and center selection
   const [selectedState, setSelectedState] = useState<string>('');      // Selected state ID
@@ -151,11 +152,19 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
     stateName: string;
   }>>([]);
 
-  // Store center's CATCHMENT_AREA fetched via API in reassign mode
-  const [reassignCenterCatchmentArea, setReassignCenterCatchmentArea] = useState<any>(null);
+  // Store center's CATCHMENT_AREA fetched via API in reassign mode (keyed by centerId to avoid stale usage during center switches)
+  const [reassignCenterCatchmentArea, setReassignCenterCatchmentArea] = useState<{
+    centerId: string;
+    selectedValues: any[] | null;
+  } | null>(null);
 
   // Load villages for all catchment blocks
   const loadVillagesForBlocks = useCallback(async () => {
+    const __seq = ++__villagesLoadSeqRef.current;
+    const __centerAtStart = selectedCenter;
+    const __blockIdsAtStart = Array.isArray(catchmentBlocks)
+      ? catchmentBlocks.map((b) => String(b.id)).join(',')
+      : '';
     if (!selectedCenter || catchmentBlocks.length === 0) {
       setVillagesByBlock({});
       setVillagesDisplayLimit({});
@@ -278,6 +287,18 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
         }
       }
 
+      // Latest-wins guard: prevent older in-flight loads from overwriting the newest center/blocks state
+      // (this can happen during rapid center changes in reassign flow)
+      const __isLatest = __seq === __villagesLoadSeqRef.current;
+      const __sameCenter = selectedCenter === __centerAtStart;
+      const __sameBlocks =
+        (Array.isArray(catchmentBlocks)
+          ? catchmentBlocks.map((b) => String(b.id)).join(',')
+          : '') === __blockIdsAtStart;
+      if (!__isLatest || !__sameCenter || !__sameBlocks) {
+        return;
+      }
+
       setVillagesByBlock(villagesData);
       setVillagesDisplayLimit(displayLimits);
 
@@ -873,7 +894,8 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
       return;
     }
 
-    setReassignCenterCatchmentArea(null); // Clear previous center's catchment while loading
+    // Clear previous center's catchment while loading, but keep centerId so extract logic can't accidentally use stale data
+    setReassignCenterCatchmentArea({ centerId: selectedCenter, selectedValues: null });
     setSelectedVillages(new Set()); // Clear village selection when center changes so new center's list is fresh
     let isMounted = true;
     const centerIdToFetch = selectedCenter;
@@ -916,17 +938,29 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
           );
 
           if (catchmentAreaField && catchmentAreaField.selectedValues) {
-            setReassignCenterCatchmentArea(catchmentAreaField.selectedValues);
+            setReassignCenterCatchmentArea({
+              centerId: centerIdToFetch,
+              selectedValues: catchmentAreaField.selectedValues,
+            });
           } else {
-            setReassignCenterCatchmentArea(null);
+            setReassignCenterCatchmentArea({
+              centerId: centerIdToFetch,
+              selectedValues: null,
+            });
           }
         } else {
-          setReassignCenterCatchmentArea(null);
+          setReassignCenterCatchmentArea({
+            centerId: centerIdToFetch,
+            selectedValues: null,
+          });
         }
       } catch (error) {
         console.error('Error fetching center CATCHMENT_AREA:', error);
         if (isMounted) {
-          setReassignCenterCatchmentArea(null);
+          setReassignCenterCatchmentArea({
+            centerId: centerIdToFetch,
+            selectedValues: null,
+          });
         }
       }
     };
@@ -941,7 +975,14 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
   // Extract catchment blocks from selected center's CATCHMENT_AREA or fetched CATCHMENT_AREA (in reassign mode)
   useEffect(() => {
     // Priority 1: In reassign mode, use fetched CATCHMENT_AREA for the currently selected center (fetched when selectedCenter changes)
-    if (isForReassign && selectedCenter && reassignCenterCatchmentArea) {
+    if (
+      isForReassign &&
+      selectedCenter &&
+      reassignCenterCatchmentArea &&
+      reassignCenterCatchmentArea.centerId === selectedCenter &&
+      Array.isArray(reassignCenterCatchmentArea.selectedValues) &&
+      reassignCenterCatchmentArea.selectedValues.length > 0
+    ) {
       // Extract blocks from fetched center's CATCHMENT_AREA
       const extractedBlocks: Array<{
         id: string | number;
@@ -952,8 +993,9 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
         stateName: string;
       }> = [];
 
-      if (Array.isArray(reassignCenterCatchmentArea) && reassignCenterCatchmentArea.length > 0) {
-        reassignCenterCatchmentArea.forEach((stateData: any) => {
+      const __selectedValues = reassignCenterCatchmentArea.selectedValues;
+      if (Array.isArray(__selectedValues) && __selectedValues.length > 0) {
+        __selectedValues.forEach((stateData: any) => {
           const stateId = stateData.stateId;
           const stateName = stateData.stateName || '';
 
@@ -1847,7 +1889,7 @@ const WorkingVillageAssignmentWidget: React.FC<WorkingVillageAssignmentWidgetPro
                 return (
                   <Accordion
                     key={block.id}
-                    defaultExpanded
+                    defaultExpanded={false}
                     sx={{
                       border: '1px solid',
                       borderColor: 'divider',

libs/shared-lib-v2/src/lib/context/locales/en.json

@@ -161,7 +161,8 @@
     },
     "CHANGE_USER": "Change User",
     "FETCH_USER": "Fetch User",
-    "SEARCH_USER_BY_EMAIL_DESCRIPTION": "Search for an existing user by email and allocate working village to them"
+    "SEARCH_USER_BY_EMAIL_DESCRIPTION": "Search for an existing user by email and allocate working village to them",
+    "RESET_USER": "Reset User"
   },
   "SWITCH_ACCOUNT": {
     "TITLE": "Select Account",