iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: timeout error message (#10478)

This commit is contained in:
Erik Ritter 2020-07-29 15:58:46 -07:00 committed by GitHub
parent 259a344fd1
commit 1fbd920902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
superset-frontend/package-lock.json generated
View File

@ -8108,12 +8108,12 @@
}
},
"@superset-ui/connection": {
"version": "0.14.9",
"resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.9.tgz",
"integrity": "sha512-47Qvs4hdXnDf8fEY4p+13qxgLldT8NCXoF5HudOune3l/AcNDbOUcx6EGz+FgYwzMgYW6Tv9u9cQlhZAXDYBtQ==",
"version": "0.14.19",
"resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.19.tgz",
"integrity": "sha512-FuF7ayqSggStQVCGkm69aeummzbz6GgcgMsEcdUTmh4ZVo75APpMmmMQeAO1AjMTfdtZ2w0DaTaEfShCheBPkQ==",
"requires": {
"@babel/runtime": "^7.1.2",
"fetch-retry": "^3.1.0",
"fetch-retry": "^4.0.1",
"whatwg-fetch": "^3.0.0"
}
},
@ -8728,10 +8728,28 @@
"@superset-ui/validator": "0.14.9"
},
"dependencies": {
"@superset-ui/connection": {
"version": "0.14.9",
"resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.9.tgz",
"integrity": "sha512-47Qvs4hdXnDf8fEY4p+13qxgLldT8NCXoF5HudOune3l/AcNDbOUcx6EGz+FgYwzMgYW6Tv9u9cQlhZAXDYBtQ==",
"requires": {
"@babel/runtime": "^7.1.2",
"fetch-retry": "^3.1.0",
"whatwg-fetch": "^3.0.0"
}
},
"@superset-ui/query": {
"version": "0.14.9",
"resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.9.tgz",
"integrity": "sha512-tldCA8YzqG02oCz/mSY5xA2g3AAqdF5f2p755tPimUHCqtn5axnE38AaRDz+0PyKNyStx0JkYkOVgqvX2ggpzA=="
},
"fetch-retry": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-3.2.3.tgz",
"integrity": "sha512-baMBEv4uZ1X1cUZAvnM+C9XI7tl4CgHgJE0KBHo3JzuXO7atOeWD5HSkDA2oLYpbzLTZNslFckLkIn6T96hlew==",
"requires": {
"es6-promise": "^4.2.8"
}
}
}
},
@ -17886,12 +17904,9 @@
}
},
"fetch-retry": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-3.2.3.tgz",
"integrity": "sha512-baMBEv4uZ1X1cUZAvnM+C9XI7tl4CgHgJE0KBHo3JzuXO7atOeWD5HSkDA2oLYpbzLTZNslFckLkIn6T96hlew==",
"requires": {
"es6-promise": "^4.2.8"
}
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.0.1.tgz",
"integrity": "sha512-EhIeVBkq9T2z1ANDr2kmLujoHOTdLvR9t/nzLSdX4PMIFinLyyZFYX9T6Fb3LrbiHQEhujq1O7ElsqjuqYIsEA=="
},
"figgy-pudding": {
"version": "3.5.1",

2
superset-frontend/package.json
View File

@ -67,7 +67,7 @@
"@superset-ui/chart-composition": "^0.14.9",
"@superset-ui/chart-controls": "^0.14.9",
"@superset-ui/color": "^0.14.9",
"@superset-ui/connection": "^0.14.9",
"@superset-ui/connection": "^0.14.19",
"@superset-ui/core": "^0.14.9",
"@superset-ui/dimension": "^0.14.9",
"@superset-ui/legacy-plugin-chart-calendar": "^0.14.9",

7
superset-frontend/src/utils/getClientErrorObject.ts
View File

@ -36,7 +36,7 @@ export type ClientErrorObject = {
} & Partial<SupersetClientResponse>;
export default function getClientErrorObject(
response: SupersetClientResponse | string,
response: SupersetClientResponse | (Response & { timeout: number }) | string,
): Promise<ClientErrorObject> {
// takes a SupersetClientResponse as input, attempts to read response as Json if possible,
// and returns a Promise that resolves to a plain object with error key and text value.
@ -89,7 +89,8 @@ export default function getClientErrorObject(
});
} else if (
'statusText' in response &&
response.statusText === 'timeout'
response.statusText === 'timeout' &&
'timeout' in response
) {
resolve({
...responseObject,
@ -98,7 +99,7 @@ export default function getClientErrorObject(
{
error_type: ErrorTypeEnum.FRONTEND_TIMEOUT_ERROR,
extra: {
timeout: 1,
timeout: response.timeout / 1000,
issue_codes: [
{
code: 1000,