@visns-studio/visns-components 4.10.7 → 4.10.8

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -60,6 +60,7 @@ import CustomFetch from './Fetch';
 import Download from './Download';
 import Form from './Form';
 import _ from 'lodash';
+import { distance2D } from 'framer-motion';
 
 const loadData = async (
     { skip, limit, sortInfo, filterValue },
@@ -241,23 +242,65 @@ const DataGrid = forwardRef(
             const toastId = toast.loading('Starting download please wait...');
 
             try {
-                const res = await Download(
-                    `/ajax/files/download/${d.id}/null`,
-                    'GET',
-                    {}
-                );
+                if (d.id && d.id > 0) {
+                    const res = await Download(
+                        `/ajax/files/download/${d.id}/null`,
+                        'GET',
+                        {}
+                    );
 
-                if (res.data.error) {
-                    toast.error(res.data.error);
+                    if (res.data.error) {
+                        toast.error(res.data.error);
+                    } else {
+                        // Assuming the response contains a Blob or similar data
+                        if (res.data && res.data instanceof Blob) {
+                            const fileName = `${d.file_name}`;
+                            saveAs(res.data, fileName);
+                        } else {
+                            // Handle the case where the response is not a Blob
+                            toast.error('Invalid file format received.');
+                        }
+                    }
                 } else {
-                    // Assuming the response contains a Blob or similar data
-                    if (res.data && res.data instanceof Blob) {
-                        const fileName = `${d.file_name}`;
-                        saveAs(res.data, fileName);
+                    toast.error(
+                        'An issue with downloading the file has occurred.'
+                    );
+                }
+            } catch (error) {
+                console.info(error);
+            } finally {
+                // Dismiss the loading toast in the finally block to ensure it's always dismissed
+                toast.dismiss(toastId);
+            }
+        };
+
+        const handleDownloadPath = async (file) => {
+            const toastId = toast.loading('Starting download please wait...');
+
+            try {
+                if (file.file_path && file.file_name && file.file_extension) {
+                    const res = await Download(
+                        `/ajax/files/downloadByPath`,
+                        'POST',
+                        { ...file }
+                    );
+
+                    if (res.data.error) {
+                        toast.error(res.data.error);
                     } else {
-                        // Handle the case where the response is not a Blob
-                        toast.error('Invalid file format received.');
+                        // Assuming the response contains a Blob or similar data
+                        if (res.data && res.data instanceof Blob) {
+                            const fileName = `${file.file_name}`;
+                            saveAs(res.data, fileName);
+                        } else {
+                            // Handle the case where the response is not a Blob
+                            toast.error('Invalid file format received.');
+                        }
                     }
+                } else {
+                    toast.error(
+                        'An issue with downloading the file has occurred.'
+                    );
                 }
             } catch (error) {
                 console.info(error);
@@ -1733,9 +1776,19 @@ const DataGrid = forwardRef(
                                                             onClick={(e) => {
                                                                 e.stopPropagation();
                                                                 e.preventDefault();
-                                                                handleDownload(
-                                                                    file
-                                                                );
+
+                                                                if (
+                                                                    file.id &&
+                                                                    file.id > 0
+                                                                ) {
+                                                                    handleDownload(
+                                                                        file
+                                                                    );
+                                                                } else {
+                                                                    handleDownloadPath(
+                                                                        file
+                                                                    );
+                                                                }
                                                             }}
                                                             style={{
                                                                 marginRight: