@visns-studio/visns-components 3.9.0 → 3.9.1

package/components/crm/DataGrid.jsx

@@ -18,7 +18,6 @@ import NumberFilter from '@inovua/reactdatagrid-community/NumberFilter';
 import SelectFilter from '@inovua/reactdatagrid-community/SelectFilter';
 import DateFilter from '@inovua/reactdatagrid-community/DateFilter';
 import ReactDataGrid from '@inovua/reactdatagrid-community';
-import PaginationToolbar from '@inovua/reactdatagrid-community/packages/PaginationToolbar';
 import { confirmAlert } from 'react-confirm-alert';
 import { toast } from 'react-toastify';
 import {
@@ -54,11 +53,10 @@ import _ from 'lodash';
 const loadData = async (
     { skip, limit, sortInfo, filterValue },
     search,
-    ajaxSetting,
-    currentPage
+    ajaxSetting
 ) => {
     const url = ajaxSetting.url;
-    const page = currentPage;
+    const page = Math.floor(skip / limit) + 1;
     const params = { page, sortInfo, take: limit, search: search, where: [] };
 
     if (sortInfo) {
@@ -160,32 +158,11 @@ const DataGrid = forwardRef(
             setFormData(form);
         }, [form]);
         /** Table States */
-        const currentPageRef = useRef(1); // Initialize with default value
-        const previousDataReloadRef = useRef(0);
-
         const [dataReload, setDataReload] = useState(0);
         const [dSearch, setDSearch] = useState('');
-        const data = useCallback(
+        const dataSource = useCallback(
             (params) => {
-                let currentPage;
-                // Preserve the last currentPage value
-                const previousDataReload = previousDataReloadRef.current;
-
-                if (dataReload !== previousDataReload) {
-                    currentPage = currentPageRef.current;
-                    previousDataReloadRef.current = dataReload;
-                } else {
-                    // Update the currentPageRef with the new value
-                    currentPage = currentPageRef.current =
-                        Math.floor(params.skip / params.limit) + 1;
-                }
-
-                const sqlResult = loadData(
-                    params,
-                    dSearch,
-                    ajaxSetting,
-                    currentPage
-                );
+                const sqlResult = loadData(params, dSearch, ajaxSetting);
                 if (setFilterData && params.filterValue) {
                     setFilterData(params.filterValue);
                 }
@@ -571,13 +548,15 @@ const DataGrid = forwardRef(
         };
 
         const handleReload = () => {
-            const min = 0;
-            const max = 999999999;
-            const randomNumber = Math.floor(
-                Math.random() * (max - min + 1) + min
-            );
+            // const min = 0;
+            // const max = 999999999;
+            // const randomNumber = Math.floor(
+            //     Math.random() * (max - min + 1) + min
+            // );
 
-            setDataReload(randomNumber);
+            // setDataReload(randomNumber);
+
+            gridRef.current.paginationProps.reload();
         };
 
         const handleSort = (value) => {
@@ -856,18 +835,6 @@ const DataGrid = forwardRef(
             [form]
         );
 
-        const renderPaginationToolbar = useCallback((paginationProps) => {
-            let pageProps = paginationProps;
-            let newSkip = (currentPageRef.current - 1) * pageProps.limit;
-            pageProps.skip = newSkip;
-
-            return (
-                <div style={{ height: 89 }}>
-                    <PaginationToolbar {...pageProps} bordered={false} />
-                </div>
-            );
-        }, []);
-
         const handleCoding = (c, data) => {
             const icons = [];
             const assetPath =
@@ -2522,7 +2489,7 @@ const DataGrid = forwardRef(
                         <ReactDataGrid
                             {...tableSetting}
                             columns={gridColumns}
-                            dataSource={data}
+                            dataSource={dataSource}
                             filterValue={filterValue}
                             limit={limit}
                             enableColumnAutosize={false}
@@ -2543,7 +2510,6 @@ const DataGrid = forwardRef(
                             pagination
                             renderRowContextMenu={renderRowContextMenu}
                             renderColumnContextMenu={renderColumnContextMenu}
-                            renderPaginationToolbar={renderPaginationToolbar}
                             rowClassName="vs-datagrid--row"
                             rowHeight={null}
                             selected={selected}
@@ -2578,6 +2544,7 @@ const DataGrid = forwardRef(
                         fetchTable={handleReload}
                         formSettings={formData}
                         formType={formType}
+                        gridRef={gridRef}
                         mapbox={mapbox}
                         paramValue={paramValue}
                         style={style}

package/package.json

@@ -54,7 +54,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "3.9.0",
+    "version": "3.9.1",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {