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

Merge pull request #4570 from influxdata/cors-fix 

Handle cors feed request with fetch api
pull/4571/head
Brandon Farmer 2018-10-10 15:36:04 -07:00 committed by GitHub
parent 80087c9b15 0b3abedf78
commit 79efa8bb0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/status/actions/index.ts
View File

@ -8,7 +8,6 @@ import {notify} from 'src/shared/actions/notifications'
import {notifyJSONFeedFailed} from 'src/shared/copy/notifications' import {notifyJSONFeedFailed} from 'src/shared/copy/notifications'
import {JSONFeedData} from 'src/types' import {JSONFeedData} from 'src/types'
import {AxiosResponse} from 'axios'
export enum ActionTypes { export enum ActionTypes {
FETCH_JSON_FEED_REQUESTED = 'FETCH_JSON_FEED_REQUESTED', FETCH_JSON_FEED_REQUESTED = 'FETCH_JSON_FEED_REQUESTED',
@ -54,7 +53,7 @@ export const fetchJSONFeedAsync = (url: string) => async (
): Promise<void> => { ): Promise<void> => {
dispatch(fetchJSONFeedRequested()) dispatch(fetchJSONFeedRequested())
try { try {
const {data} = (await fetchJSONFeedAJAX(url)) as AxiosResponse<JSONFeedData> const data = (await fetchJSONFeedAJAX(url)) as JSONFeedData
// data could be from a webpage, and thus would be HTML // data could be from a webpage, and thus would be HTML
if (typeof data === 'string' || !data) { if (typeof data === 'string' || !data) {
dispatch(fetchJSONFeedFailed()) dispatch(fetchJSONFeedFailed())

22
ui/src/status/apis/index.ts
View File

@ -1,16 +1,8 @@
import AJAX from 'src/utils/ajax' export const fetchJSONFeed = async (url: string) => {
import {JSONFeedData} from 'src/types' const response = await fetch(url, {
method: 'GET',
mode: 'cors',
})
const excludeBasepath = true // don't prefix route of external link with basepath/ return response.json()
}
export const fetchJSONFeed = (url: string) =>
AJAX<JSONFeedData>(
{
method: 'GET',
url,
// For explanation of why this header makes this work:
// https://stackoverflow.com/questions/22968406/how-to-skip-the-options-preflight-request-in-angularjs
headers: {'Content-Type': 'text/plain; charset=UTF-8'},
},
excludeBasepath // don't prefix route of external link with basepath
)