@dartech/arsenal-ui 1.4.7 → 1.4.9

package/index.js

@@ -2699,28 +2699,31 @@ const useTableQuerySorting = () => {
   const [queryParams, setQueryParams] = useSearchParams();
   const sortParams = queryParams.getAll('sort').map(param => param.split(','));
   const onColumnHeaderClick = ({
-    field
+    field,
+    colDef
   }) => {
-    let keyFound = false;
-    const sortValues = queryParams.getAll('sort');
-    queryParams.delete('sort');
-    sortValues.forEach(sortValue => {
-      const [key, sort] = sortValue.split(',');
-      if (key === field) {
-        keyFound = true;
-        if (sort === 'asc') {
-          queryParams.append('sort', `${key},desc`);
+    if (colDef.sortable) {
+      let keyFound = false;
+      const sortValues = queryParams.getAll('sort');
+      queryParams.delete('sort');
+      sortValues.forEach(sortValue => {
+        const [key, sort] = sortValue.split(',');
+        if (key === field) {
+          keyFound = true;
+          if (sort === 'asc') {
+            queryParams.append('sort', `${key},desc`);
+          }
+        } else {
+          queryParams.append('sort', `${key},${sort}`);
         }
-      } else {
-        queryParams.append('sort', `${key},${sort}`);
+      });
+      if (!keyFound) {
+        queryParams.append('sort', `${field},asc`);
       }
-    });
-    if (!keyFound) {
-      queryParams.append('sort', `${field},asc`);
+      setQueryParams(queryParams, {
+        replace: true
+      });
     }
-    setQueryParams(queryParams, {
-      replace: true
-    });
   };
   const getSortedColumns = columns => {
     return columns.map(column => {
@@ -5969,7 +5972,6 @@ const PropertyFiller = ({
       control: control,
       label: valueLabel,
       parseValue: true,
-      validateJson: true,
       hideErrorMessage: true
     }) : jsx(ControlInput, {
       control: control,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/lib/Table/DataGrid/useTableQuerySorting.d.ts

@@ -1,6 +1,6 @@
 import { GridColumnHeaderParams, GridColumns } from '@mui/x-data-grid';
 export declare const useTableQuerySorting: () => {
-    onColumnHeaderClick: ({ field }: GridColumnHeaderParams) => void;
+    onColumnHeaderClick: ({ field, colDef }: GridColumnHeaderParams) => void;
     getSortedColumns: (columns: GridColumns<any>) => GridColumns<any>;
 };
 export default useTableQuerySorting;