Skip to content

Commit 95feddd

Browse files
authored
Merge branch 'main' into fix/show-delete-agent-successfully-without-checking-the-result
2 parents 4f61143 + d45c9c3 commit 95feddd

File tree

5 files changed

+21008
-3
lines changed

5 files changed

+21008
-3
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ test*
44
Dockerfile*
55
*~
66
screenshots
7+
**/node_modules
8+
**/.temp
9+
**/__pycache__

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ yarn-error.log
218218

219219
/coverage
220220
.idea
221-
yarn.lock
222221
package-lock.json
223222
*bak
224223
.vscode

src/dashboard/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
"check-prettier": "^1.0.1",
107107
"cross-env": "^5.2.0",
108108
"cross-port-killer": "^1.0.1",
109-
"enzyme": "^3.9.0",
110109
"eslint": "^8.53.0",
111110
"eslint-config-airbnb": "^19.0.4",
112111
"eslint-config-prettier": "^9.0.0",

src/dashboard/src/utils/request.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,19 @@ const errorHandler = error => {
8181
defaultMessage: 'An error occurred while processing your request.',
8282
});
8383

84+
const safeDetailMessage = (obj => {
85+
if (typeof obj === 'string') {
86+
return obj;
87+
}
88+
if (typeof obj === 'object') {
89+
return JSON.stringify(obj);
90+
}
91+
return String(obj);
92+
})(detailMessage);
93+
8494
notification.error({
8595
message: errorMessage,
86-
description: `${url}\n${detailMessage}`,
96+
description: safeDetailMessage,
8797
});
8898

8999
// Handle navigation for specific error codes

0 commit comments

Comments
 (0)