@visns-studio/visns-components 5.6.3 → 5.6.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
"react-dom": "^17.0.0 || ^18.0.0"
|
|
85
85
|
},
|
|
86
86
|
"name": "@visns-studio/visns-components",
|
|
87
|
-
"version": "5.6.
|
|
87
|
+
"version": "5.6.5",
|
|
88
88
|
"description": "Various packages to assist in the development of our Custom Applications.",
|
|
89
89
|
"main": "src/index.js",
|
|
90
90
|
"files": [
|
|
@@ -35,28 +35,64 @@ const CustomDownload = (
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
method: method,
|
|
40
|
-
data: formData,
|
|
41
|
-
headers: headers,
|
|
42
|
-
url: url,
|
|
43
|
-
responseType: 'blob',
|
|
44
|
-
};
|
|
45
|
-
|
|
38
|
+
// First make a request to check if the request is valid
|
|
46
39
|
return trackPromise(
|
|
47
40
|
new Promise((resolve, reject) => {
|
|
48
|
-
|
|
41
|
+
// First, make a request without responseType: 'blob' to check for errors
|
|
42
|
+
axios({
|
|
43
|
+
method: method,
|
|
44
|
+
data: formData,
|
|
45
|
+
headers: headers,
|
|
46
|
+
url: url,
|
|
47
|
+
})
|
|
49
48
|
.then((response) => {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
// If the response is JSON and contains an error, handle it
|
|
50
|
+
if (response.data && response.data.success === false) {
|
|
51
|
+
let errorMessage =
|
|
52
|
+
response.data.message || 'Unknown error';
|
|
53
|
+
if (response.data.error) {
|
|
54
|
+
errorMessage += ': ' + response.data.error;
|
|
55
|
+
}
|
|
54
56
|
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
+
if (errorCallback) {
|
|
58
|
+
errorCallback(errorMessage);
|
|
59
|
+
} else {
|
|
60
|
+
toast.error(<div>{parse(errorMessage)}</div>);
|
|
57
61
|
}
|
|
62
|
+
|
|
63
|
+
// Resolve with the error response
|
|
64
|
+
resolve(response);
|
|
65
|
+
} else {
|
|
66
|
+
// If no error, make the actual blob request
|
|
67
|
+
axios({
|
|
68
|
+
method: method,
|
|
69
|
+
data: formData,
|
|
70
|
+
headers: headers,
|
|
71
|
+
url: url,
|
|
72
|
+
responseType: 'blob',
|
|
73
|
+
})
|
|
74
|
+
.then((blobResponse) => {
|
|
75
|
+
if (successCallback) {
|
|
76
|
+
successCallback(blobResponse.data);
|
|
77
|
+
}
|
|
78
|
+
resolve(blobResponse);
|
|
79
|
+
})
|
|
80
|
+
.catch((blobError) => {
|
|
81
|
+
let errorMessage =
|
|
82
|
+
blobError.message ||
|
|
83
|
+
'Error downloading file';
|
|
84
|
+
|
|
85
|
+
if (errorCallback) {
|
|
86
|
+
errorCallback(errorMessage);
|
|
87
|
+
} else {
|
|
88
|
+
toast.error(
|
|
89
|
+
<div>{parse(errorMessage)}</div>
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
reject(blobError);
|
|
94
|
+
});
|
|
58
95
|
}
|
|
59
|
-
resolve(response);
|
|
60
96
|
})
|
|
61
97
|
.catch((error) => {
|
|
62
98
|
let errorMessage = '';
|