@blocklet/discuss-kit-ux-lite 2.6.12 → 2.6.13
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.
|
@@ -40,6 +40,14 @@ const markErrorShown = (errorKey) => {
|
|
|
40
40
|
recentErrors.set(errorKey, Date.now());
|
|
41
41
|
toastCount++;
|
|
42
42
|
};
|
|
43
|
+
const getErrorMessage = (data, fallback) => {
|
|
44
|
+
if (data && typeof data === "object") {
|
|
45
|
+
const { message, error } = data;
|
|
46
|
+
if (typeof message === "string" && message) return message;
|
|
47
|
+
if (typeof error === "string" && error) return error;
|
|
48
|
+
}
|
|
49
|
+
return fallback;
|
|
50
|
+
};
|
|
43
51
|
export const useDefaultApiErrorHandler = (options) => {
|
|
44
52
|
const { request, onError } = options;
|
|
45
53
|
const { t } = useLocaleContext();
|
|
@@ -73,21 +81,21 @@ export const useDefaultApiErrorHandler = (options) => {
|
|
|
73
81
|
const statusCode = response.status;
|
|
74
82
|
switch (statusCode) {
|
|
75
83
|
case 400: {
|
|
76
|
-
showError(t("apiError.400"));
|
|
84
|
+
showError(getErrorMessage(response.data, t("apiError.400")));
|
|
77
85
|
break;
|
|
78
86
|
}
|
|
79
87
|
case 401: {
|
|
80
|
-
showError(t("apiError.401"));
|
|
88
|
+
showError(getErrorMessage(response.data, t("apiError.401")));
|
|
81
89
|
break;
|
|
82
90
|
}
|
|
83
91
|
case 403: {
|
|
84
|
-
showError(t("apiError.403"));
|
|
92
|
+
showError(getErrorMessage(response.data, t("apiError.403")));
|
|
85
93
|
break;
|
|
86
94
|
}
|
|
87
95
|
case 409: {
|
|
88
96
|
showWarning(
|
|
89
97
|
/* @__PURE__ */ jsxs(Box, { children: [
|
|
90
|
-
/* @__PURE__ */ jsx(Box, { children: t("apiError.409") }),
|
|
98
|
+
/* @__PURE__ */ jsx(Box, { children: getErrorMessage(response.data, t("apiError.409")) }),
|
|
91
99
|
/* @__PURE__ */ jsxs(Box, { children: [
|
|
92
100
|
"(",
|
|
93
101
|
t("apiError.staleTip"),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blocklet/discuss-kit-ux-lite",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.13",
|
|
4
4
|
"files": [
|
|
5
5
|
"dist"
|
|
6
6
|
],
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"ufo": "^1.5.4",
|
|
45
45
|
"unstated-next": "^1.1.0",
|
|
46
46
|
"zustand": "^4.5.5",
|
|
47
|
-
"@blocklet/editor-lite": "2.6.
|
|
47
|
+
"@blocklet/editor-lite": "2.6.13"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"@arcblock/did-connect-react": "^3.1.5",
|