@visns-studio/visns-components 5.9.3 → 5.9.4

package/package.json

@@ -86,7 +86,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.9.3",
+    "version": "5.9.4",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/DataGrid.jsx

@@ -587,6 +587,17 @@ const DataGrid = forwardRef(
         /** Group expansion state */
         const [collapsedGroups, setCollapsedGroups] = useState({});
 
+        /** Track if groups have been initialized to prevent re-initialization */
+        const groupsInitializedRef = useRef(false);
+
+        // Reset initialization flag and clear state when groupBy changes
+        useEffect(() => {
+            if (ajaxSetting?.groupBy) {
+                groupsInitializedRef.current = false;
+                setCollapsedGroups({}); // Clear existing state when groupBy changes
+            }
+        }, [ajaxSetting?.groupBy]);
+
         /** Force re-render trigger for group header consistency */
         const [groupRenderKey, setGroupRenderKey] = useState(0);
 
@@ -670,6 +681,21 @@ const DataGrid = forwardRef(
                                 .toString()
                                 .localeCompare(bValue.toString());
                         });
+
+                        // Initialize all groups as collapsed when data is first loaded
+                        if (!groupsInitializedRef.current && res.data.length > 0) {
+                            const uniqueGroups = [...new Set(res.data.map(row => row[groupField]))];
+                            const initialCollapsedState = {};
+                            uniqueGroups.forEach(groupValue => {
+                                if (groupValue !== undefined && groupValue !== null) {
+                                    initialCollapsedState[groupValue] = true;
+                                }
+                            });
+
+                            console.log('Initializing all groups as collapsed:', initialCollapsedState);
+                            setCollapsedGroups(initialCollapsedState);
+                            groupsInitializedRef.current = true;
+                        }
                     }
 
                     if (setTotal) {