Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(ui): propagate network failure

pull/5611/head
Pavel Zavora 2020-11-11 09:40:14 +01:00
parent 5c1aac9ebb
commit de2a15906a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/shared/parsing/index.ts
View File

@ -51,7 +51,8 @@ export const extractQueryErrorMessage = (errorMessage: string): string => {
return 'Could not retrieve data' return 'Could not retrieve data'
} }
const parseErrorMatch = errorMessage.match('error parsing query') const parseErrorMatch =
errorMessage.match && errorMessage.match('error parsing query')
if (parseErrorMatch) { if (parseErrorMatch) {
return errorMessage.slice(parseErrorMatch.index) return errorMessage.slice(parseErrorMatch.index)

8
ui/src/utils/ajax.ts
View File

@ -93,7 +93,7 @@ async function AJAX<T = any>(
headers = {}, headers = {},
}: RequestParams, }: RequestParams,
excludeBasepath = false excludeBasepath = false
): Promise<(T | T & {links: object}) | AxiosResponse<T>> { ): Promise<(T | (T & {links: object})) | AxiosResponse<T>> {
try { try {
url = addBasepath(url, excludeBasepath) url = addBasepath(url, excludeBasepath)
@ -117,7 +117,11 @@ async function AJAX<T = any>(
return links ? generateResponseWithLinks(response, links) : response return links ? generateResponseWithLinks(response, links) : response
} catch (error) { } catch (error) {
const {response} = error const {response} = error
throw links ? generateResponseWithLinks(response, links) : response // eslint-disable-line no-throw-literal if (response) {
throw links ? generateResponseWithLinks(response, links) : response // eslint-disable-line no-throw-literal
} else {
throw error
}
} }
} }