@visns-studio/visns-components 2.4.6 → 2.4.8

package/components/cms/DataGrid.jsx

@@ -98,6 +98,7 @@ const DataGrid = ({
     gridHeight,
     settings,
     setFilterData,
+    setConfig,
     style,
 }) => {
     const navigate = useNavigate();
@@ -267,6 +268,23 @@ const DataGrid = ({
         setDataReload(randomNumber);
     };
 
+    const handleSort = (value) => {
+        setConfig((prevState) => {
+            const { id, dir } = value || {}; // Destructure id and dir from value (if provided)
+            const sortBy = id || null;
+            const sort = dir === 1 ? 'asc' : dir === -1 ? 'desc' : null;
+
+            return {
+                ...prevState,
+                ajaxSetting: {
+                    ...prevState.ajaxSetting,
+                    sortBy,
+                    sort,
+                },
+            };
+        });
+    };
+
     const onRowClick = useCallback(
         (rowProps, event) => {
             const cellElement = event.target.closest(
@@ -1401,7 +1419,6 @@ const DataGrid = ({
                 columns={gridColumns}
                 dataSource={data}
                 filterValue={filterValue}
-                defaultSortInfo={sortInfo}
                 enableColumnAutosize={false}
                 enableColumnFilterContextMenu={false}
                 enableSelection={false}
@@ -1414,11 +1431,20 @@ const DataGrid = ({
                 minRowHeight={40}
                 onFilterValueChange={setFilterValue}
                 onLimitChange={setLimit}
+                onSortInfoChange={handleSort}
                 onRenderRow={onRenderRow}
                 pagination
                 renderColumnContextMenu={renderColumnContextMenu}
                 rowHeight={null}
                 showZebraRows={true}
+                sortInfo={
+                    ajaxSetting.sortBy && ajaxSetting.sort
+                        ? {
+                              name: ajaxSetting.sortBy,
+                              dir: ajaxSetting.sort === 'asc' ? 1 : -1,
+                          }
+                        : null
+                }
                 style={gridStyle}
             />
             <Popup

package/components/cms/generic/CmsIndex.jsx

@@ -53,6 +53,7 @@ function CmsIndex({ setting, userProfile }) {
                                         <DataGrid
                                             {...config}
                                             gridHeight={windowHeight * 0.65}
+                                            setConfig={setConfig}
                                             style={
                                                 userProfile?.settings?.style ||
                                                 {}

package/components/crm/DataGrid.jsx

@@ -1274,7 +1274,12 @@ const DataGrid = forwardRef(
                                             .map((nf) => value[nf])
                                             .join(' ');
                                     } else {
-                                        if (value && value[column.nameFrom]) {
+                                        if (
+                                            value &&
+                                            value.hasOwnProperty(
+                                                column.nameFrom
+                                            )
+                                        ) {
                                             value = value[column.nameFrom];
                                         }
                                     }

package/package.json

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