Cancel dashboard ajax requests when query is changed (#197)

pull/215/head
Uku Taht 6 years ago committed by GitHub
parent 517d4db262
commit 802b69e15a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,5 +1,6 @@
import css from "../css/app.css"
import "./polyfills/closest"
import 'abortcontroller-polyfill/dist/polyfill-patch-fetch'
import "phoenix_html"
const triggers = document.querySelectorAll('[data-dropdown-trigger]')

@ -1,5 +1,7 @@
import {formatISO} from './date'
let abortController = new AbortController()
function serialize(obj) {
var str = [];
for (var p in obj)
@ -9,6 +11,11 @@ function serialize(obj) {
return str.join("&");
}
export function cancelAll() {
abortController.abort()
abortController = new AbortController()
}
export function serializeQuery(query, extraQuery=[]) {
query = Object.assign({}, query, {
date: query.date ? formatISO(query.date) : undefined,
@ -22,7 +29,7 @@ export function serializeQuery(query, extraQuery=[]) {
export function get(url, query, ...extraQuery) {
url = url + serializeQuery(query, extraQuery)
return fetch(url)
return fetch(url, {signal: abortController.signal})
.then( response => {
if (!response.ok) { throw response }
return response.json()

@ -11,6 +11,7 @@ import Countries from './stats/countries'
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import {parseQuery} from './query'
import * as api from './api'
class Stats extends React.Component {
constructor(props) {
@ -20,6 +21,7 @@ class Stats extends React.Component {
componentDidUpdate(prevProps) {
if (prevProps.location.search !== this.props.location.search) {
api.cancelAll()
this.setState({query: parseQuery(this.props.location.search, this.props.site)})
}
}

File diff suppressed because it is too large Load Diff

@ -6,29 +6,30 @@
"watch": "$(npm bin)/webpack --mode development --watch"
},
"dependencies": {
"@tailwindcss/ui": "^0.1.3",
"autoprefixer": "^9.8.0",
"chart.js": "^2.9.3",
"datamaps": "^0.5.9",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-flatpickr": "^3.10.0",
"react-router-dom": "^5.1.2",
"url-search-params-polyfill": "^7.0.1",
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@babel/preset-react": "^7.9.4",
"@fullhuman/postcss-purgecss": "^2.1.2",
"@tailwindcss/ui": "^0.1.3",
"abortcontroller-polyfill": "^1.4.0",
"autoprefixer": "^9.8.0",
"babel-loader": "^8.1.0",
"chart.js": "^2.9.3",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.5.2",
"datamaps": "^0.5.9",
"mini-css-extract-plugin": "^0.8.2",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
"postcss-loader": "^3.0.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-flatpickr": "^3.10.0",
"react-router-dom": "^5.1.2",
"tailwindcss": "^1.3.1",
"uglifyjs-webpack-plugin": "^2.2.0",
"url-search-params-polyfill": "^7.0.1",
"webpack": "4.39.2",
"webpack-cli": "^3.3.11"
}

Loading…
Cancel
Save