@visns-studio/visns-components 3.8.13 → 3.9.1

package/components/cms/DataGrid.jsx

@@ -158,13 +158,6 @@ const DataGrid = ({
     const [gridColumns, setGridColumns] = useState([]);
     const [limit, setLimit] = useState(ajaxSetting.take || 10);
     const [search, setSearch] = useState('');
-    const sortInfo =
-        ajaxSetting.sortBy && ajaxSetting.sort
-            ? {
-                  name: ajaxSetting.sortBy,
-                  dir: ajaxSetting.sort === 'asc' ? 1 : -1,
-              }
-            : null;
 
     /** Table Functions */
     const handleChangeSearch = (e) => {

package/components/crm/DataGrid.jsx

@@ -51,7 +51,7 @@ import Form from './Form';
 import _ from 'lodash';
 
 const loadData = async (
-    { skip, limit, sortInfo, currentData, filterValue, groupBy },
+    { skip, limit, sortInfo, filterValue },
     search,
     ajaxSetting
 ) => {
@@ -157,11 +157,10 @@ const DataGrid = forwardRef(
         useEffect(() => {
             setFormData(form);
         }, [form]);
-
         /** Table States */
         const [dataReload, setDataReload] = useState(0);
         const [dSearch, setDSearch] = useState('');
-        const data = useCallback(
+        const dataSource = useCallback(
             (params) => {
                 const sqlResult = loadData(params, dSearch, ajaxSetting);
                 if (setFilterData && params.filterValue) {
@@ -549,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) => {
@@ -2488,7 +2489,7 @@ const DataGrid = forwardRef(
                         <ReactDataGrid
                             {...tableSetting}
                             columns={gridColumns}
-                            dataSource={data}
+                            dataSource={dataSource}
                             filterValue={filterValue}
                             limit={limit}
                             enableColumnAutosize={false}
@@ -2543,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.8.13",
+    "version": "3.9.1",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {