@visns-studio/visns-components 1.3.8 → 1.3.10

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.
@@ -1,12 +1,14 @@
1
1
  import axios from "axios";
2
2
  import { trackPromise } from "react-promise-tracker";
3
+ import { toast } from "react-toastify";
4
+ import parse from "html-react-parser";
3
5
 
4
6
  const CustomDownload = async (
5
7
  url,
6
8
  method,
7
9
  formData,
8
- successCallback,
9
- errorCallback
10
+ successCallback = null,
11
+ errorCallback = null
10
12
  ) => {
11
13
  let headers = {};
12
14
  let options = {};
@@ -42,22 +44,47 @@ const CustomDownload = async (
42
44
 
43
45
  try {
44
46
  const response = await trackPromise(axios(options));
45
- successCallback(response.data);
47
+
48
+ if (successCallback) {
49
+ successCallback(response.data);
50
+ } else {
51
+ const error =
52
+ response.data.error || "Data has been updated successfully.";
53
+ toast.error(<div>{parse(error)}</div>);
54
+ }
46
55
  } catch (error) {
56
+ let errorMessage = "";
57
+
47
58
  if (
48
59
  error.response &&
49
60
  error.response.data &&
50
61
  error.response.data.message
51
62
  ) {
52
- const errorMessage = error.response.data.message;
63
+ const { data } = error.response;
53
64
 
54
- if (errorMessage === "Unauthenticated.") {
55
- localStorage.clear();
65
+ if (data.errors) {
66
+ const { errors } = data;
67
+
68
+ Object.values(errors).forEach((errorArray) => {
69
+ errorArray.forEach((errorMsg) => {
70
+ errorMessage += `${errorMsg}<br />`;
71
+ });
72
+ });
73
+ } else {
74
+ if (data.message === "CSRF token mismatch.") {
75
+ window.location.replace("/login");
76
+ } else {
77
+ errorMessage = data.message;
78
+ }
56
79
  }
80
+ } else {
81
+ errorMessage = error.message;
82
+ }
57
83
 
84
+ if (errorCallback) {
58
85
  errorCallback(errorMessage);
59
86
  } else {
60
- errorCallback(error);
87
+ toast.error(<div>{parse(errorMessage)}</div>);
61
88
  }
62
89
  }
63
90
  };
@@ -6,7 +6,7 @@ function Select(props) {
6
6
 
7
7
  return (
8
8
  <select
9
- name={settings.id}
9
+ data-name={settings.id}
10
10
  className={className}
11
11
  onChange={onChange}
12
12
  value={inputValue}
package/package.json CHANGED
@@ -34,7 +34,7 @@
34
34
  "react-dom": "^17.0.1"
35
35
  },
36
36
  "name": "@visns-studio/visns-components",
37
- "version": "1.3.8",
37
+ "version": "1.3.10",
38
38
  "description": "Various packages to assist in the development of our Custom Applications.",
39
39
  "main": "index.js",
40
40
  "devDependencies": {},