@visns-studio/visns-components 1.7.7 → 1.8.2

package/components/crm/visns-data-grid.jsx

@@ -425,7 +425,12 @@ const DataGrid = forwardRef(
                         onChange={handleChangeSearch}
                     />
                 </div>
-            ) : null;
+            ) : (
+                <div
+                    className="filterInput--alt"
+                    style={{ height: "37px" }}
+                ></div>
+            );
         };
 
         const handleCoding = (c, data) => {

package/components/crm/visns-fetch.jsx

@@ -4,77 +4,85 @@ import { trackPromise } from "react-promise-tracker";
 import { toast } from "react-toastify";
 import parse from "html-react-parser";
 
-const CustomFetch = async (
-	url,
-	method,
-	formData,
-	successCallback = null,
-	errorCallback = null
+const CustomFetch = (
+    url,
+    method,
+    formData,
+    successCallback = null,
+    errorCallback = null
 ) => {
-	const baseUrl = "";
-	const headers = {
-		"Content-Type": "application/json",
-	};
+    const baseUrl = "";
+    const headers = {
+        "Content-Type": "application/json",
+    };
 
-	if (method.toUpperCase() === "PUT" || method.toUpperCase() === "PATCH") {
-		formData = {
-			...formData,
-			_method: method,
-		};
-	}
+    if (method.toUpperCase() === "PUT" || method.toUpperCase() === "PATCH") {
+        formData = {
+            ...formData,
+            _method: method,
+        };
+    }
 
-	const options = {
-		method: method,
-		data: formData,
-		headers: headers,
-		url: baseUrl + url,
-	};
+    const options = {
+        method: method,
+        data: formData,
+        headers: headers,
+        url: baseUrl + url,
+    };
 
-	try {
-		const response = await trackPromise(axios(options));
+    return trackPromise(
+        new Promise((resolve, reject) => {
+            axios(options)
+                .then((response) => {
+                    if (successCallback) {
+                        successCallback(response.data);
+                    } else {
+                        const error = response.data.error;
 
-		if (successCallback) {
-			successCallback(response.data);
-		} else {
-			const error =
-				response.data.error || "Data has been updated successfully.";
-			toast.error(<div>{parse(error)}</div>);
-		}
-	} catch (error) {
-		let errorMessage = "";
+                        if (error && error !== "") {
+                            toast.error(<div>{parse(error)}</div>);
+                        }
+                    }
+                    resolve(response);
+                })
+                .catch((error) => {
+                    let errorMessage = "";
 
-		if (
-			error.response &&
-			error.response.data &&
-			error.response.data.message
-		) {
-			const { data } = error.response;
+                    if (
+                        error.response &&
+                        error.response.data &&
+                        error.response.data.message
+                    ) {
+                        const { data } = error.response;
 
-			if (data.errors) {
-				const { errors } = data;
+                        if (data.errors) {
+                            const { errors } = data;
 
-				Object.values(errors).forEach((errorArray) => {
-					errorArray.forEach((errorMsg) => {
-						errorMessage += `${errorMsg}<br />`;
-					});
-				});
-			} else {
-				if (data.message === "CSRF token mismatch.") {
-					window.location.replace("/login");
-				} else {
-					errorMessage = data.message;
-				}
-			}
-		} else {
-			errorMessage = error.message;
-		}
+                            Object.values(errors).forEach((errorArray) => {
+                                errorArray.forEach((errorMsg) => {
+                                    errorMessage += `${errorMsg}<br />`;
+                                });
+                            });
+                        } else {
+                            if (data.message === "CSRF token mismatch.") {
+                                window.location.replace("/login");
+                            } else {
+                                errorMessage = data.message;
+                            }
+                        }
+                    } else {
+                        errorMessage = error.message;
+                    }
 
-		if (errorCallback) {
-			errorCallback(errorMessage);
-		} else {
-			toast.error(<div>{parse(errorMessage)}</div>);
-		}
-	}
+                    if (errorCallback) {
+                        errorCallback(errorMessage);
+                    } else {
+                        toast.error(<div>{parse(errorMessage)}</div>);
+                    }
+                    reject(error);
+                });
+        })
+    );
 };
 
 export default CustomFetch;