@visns-studio/visns-components 5.15.28 → 5.15.29

package/package.json

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

package/src/components/DataGrid.jsx

@@ -541,12 +541,52 @@ const DataGrid = forwardRef(
         const [gridColumns, setGridColumns] = useState([]);
         const [columnsMetadata, setColumnsMetadata] = useState({});
         const gridRef = useRef(null);
-        const [limit, setLimit] = useState(0);
+
+        // Get default limit from userProfile preferences, tableSetting, or default to 25
+        const getDefaultLimit = () => {
+            console.log('[DataGrid] getDefaultLimit called:', {
+                userProfile_rows_per_page: userProfile?.rows_per_page,
+                userProfile_settings_rows_per_page: userProfile?.settings?.rows_per_page,
+                tableSetting_pageSize: tableSetting?.pageSize,
+                userProfile: userProfile,
+            });
+            if (userProfile?.rows_per_page) return userProfile.rows_per_page;
+            if (userProfile?.settings?.rows_per_page) return userProfile.settings.rows_per_page;
+            if (tableSetting?.pageSize) return tableSetting.pageSize;
+            return 25;
+        };
+
+        const [limit, setLimit] = useState(() => {
+            const initialLimit = getDefaultLimit();
+            console.log('[DataGrid] Initial limit set to:', initialLimit);
+            return initialLimit;
+        });
         const [search, setSearch] = useState('');
         const [selected, setSelected] = useState({});
         const [inputDebounceTimers] = useState({});
         const [localInputValues, setLocalInputValues] = useState({});
         const localInputValuesRef = useRef({}); // Add this ref to track values
+        const initialLimitApplied = useRef(false); // Track if we've applied user's rows_per_page preference
+
+        // Effect to update limit when userProfile becomes available (for async loaded profiles)
+        useEffect(() => {
+            console.log('[DataGrid] useEffect triggered:', {
+                initialLimitApplied: initialLimitApplied.current,
+                userProfile_rows_per_page: userProfile?.rows_per_page,
+                userProfile_settings_rows_per_page: userProfile?.settings?.rows_per_page,
+                currentLimit: limit,
+            });
+            // Only apply the user's preference once, when userProfile first becomes available
+            if (!initialLimitApplied.current) {
+                const userLimit = userProfile?.rows_per_page || userProfile?.settings?.rows_per_page;
+                console.log('[DataGrid] Checking userLimit:', userLimit);
+                if (userLimit && userLimit > 0) {
+                    console.log('[DataGrid] Setting limit to userLimit:', userLimit);
+                    setLimit(userLimit);
+                    initialLimitApplied.current = true;
+                }
+            }
+        }, [userProfile?.rows_per_page, userProfile?.settings?.rows_per_page]);
 
         /** Auto Refresh States */
         const [autoRefreshEnabled, setAutoRefreshEnabled] = useState(false);
@@ -3340,7 +3380,18 @@ const DataGrid = forwardRef(
             const minHeight = getMinimumHeight();
             setGridStyle((prevState) => ({ ...prevState, minHeight }));
 
-            if (ajaxSetting?.take >= 35) {
+            // Priority for limit:
+            // 1. User's rows_per_page preference (already applied via initialLimitApplied ref)
+            // 2. ajaxSetting.take if >= 35
+            // 3. Calculated rows based on height (fallback)
+
+            // Only auto-calculate limit if user hasn't set a preference
+            const userPreferredLimit = userProfile?.rows_per_page || userProfile?.settings?.rows_per_page;
+
+            if (userPreferredLimit && userPreferredLimit > 0) {
+                // User has a preference, don't override it
+                console.log('[DataGrid] Respecting user preference, not auto-calculating limit:', userPreferredLimit);
+            } else if (ajaxSetting?.take >= 35) {
                 setLimit(ajaxSetting.take);
             } else {
                 const calculateRows = (height) =>
@@ -3349,7 +3400,7 @@ const DataGrid = forwardRef(
                 const rowCount = calculateRows(minHeight);
                 setLimit(rowCount);
             }
-        }, [dataCount, gridHeight, window.innerHeight]);
+        }, [dataCount, gridHeight, window.innerHeight, userProfile?.rows_per_page, userProfile?.settings?.rows_per_page]);
 
         useEffect(() => {
             const debouncedHandleResize = debounce(() => {