@visns-studio/visns-components 5.0.21 → 5.0.22

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -31,15 +31,18 @@ import { toast } from 'react-toastify';
 import {
     Alarm,
     ArrowCounterClockwise,
+    ArrowCycle,
     Backspace,
     Check,
     CircleCheck,
     CircleX,
     Clock,
     CloudDownload,
+    CloudUpload,
     Copy,
     Edit,
     Envelope,
+    File,
     Folder,
     Image,
     Inbox,
@@ -82,25 +85,32 @@ const loadData = async (
 
     if (filterValue) {
         filterValue.forEach((fv) => {
-            const identifier = fv.key ? fv.key : fv.name;
+            const identifier = fv.whereHas?.column || fv.key || fv.name;
             const existingIndex = params.where.findIndex(
                 (w) => w.id === identifier
             );
 
-            if (fv.value !== null && fv.value !== '') {
+            if (
+                fv.value !== undefined &&
+                fv.value !== null &&
+                fv.value !== ''
+            ) {
+                const tempParamsObject = {
+                    id: identifier,
+                    value: fv.value,
+                    operator: fv.operator,
+                    ...(fv.whereHas?.relation && {
+                        whereHas: fv.whereHas.relation,
+                    }),
+                };
+
                 if (existingIndex !== -1) {
-                    params.where[existingIndex].value = fv.value;
+                    params.where[existingIndex] = tempParamsObject;
                 } else {
-                    params.where.push({
-                        id: identifier,
-                        value: fv.value,
-                        operator: fv.operator,
-                    });
-                }
-            } else {
-                if (existingIndex !== -1) {
-                    params.where.splice(existingIndex, 1);
+                    params.where.push(tempParamsObject);
                 }
+            } else if (existingIndex !== -1) {
+                params.where.splice(existingIndex, 1);
             }
         });
     }
@@ -376,6 +386,11 @@ const DataGrid = forwardRef(
         const handleSettingClick = (s, d) => {
             switch (s.id) {
                 case 'activate':
+                case 'arrowCycle':
+                case 'cloudUpload':
+                case 'envelope':
+                case 'file':
+                case 'image':
                     CustomFetch(s.url, 'POST', { id: d[s.key] }, (result) => {
                         toast.success(result.message);
                     });
@@ -500,11 +515,6 @@ const DataGrid = forwardRef(
                         ],
                     });
                     break;
-                case 'envelope':
-                    CustomFetch(s.url, 'POST', { id: d[s.key] }, (result) => {
-                        toast.success(result.message);
-                    });
-                    break;
                 case 'gallery':
                     // Function to access nested property using a series of keys
                     const getNestedValue = (data, keys) =>
@@ -1100,6 +1110,10 @@ const DataGrid = forwardRef(
                         return getIconComponent(CircleCheck);
                     case 'archive':
                         return getIconComponent(ShippingBoxV1);
+                    case 'arrowCycle':
+                        return getIconComponent(ArrowCycle);
+                    case 'cloudUpload':
+                        return getIconComponent(CloudUpload);
                     case 'oauth2':
                         return getIconComponent(LockOn);
                     case 'clone':
@@ -1114,8 +1128,12 @@ const DataGrid = forwardRef(
                         return getIconComponent(Envelope);
                     case 'family':
                         return getIconComponent(Network);
+                    case 'file':
+                        return getIconComponent(File);
                     case 'gallery':
                         return getIconComponent(Image);
+                    case 'image':
+                        return getIconComponent(Image);
                     case 'link':
                         return getIconComponent(LinkOut);
                     case 'primary':
@@ -2487,6 +2505,7 @@ const DataGrid = forwardRef(
                                 operator: column.filter.operator,
                                 type: column.filter.type,
                                 value: filterValue,
+                                whereHas: column.filter.whereHas || {},
                                 reset: column.filter.reset
                                     ? column.filter.reset
                                     : [],