github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 11:41:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: better message if request for report is rate limited (#6298)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-08-22 11:25:12 +02:00
committed by GitHub
parent 50955dbe30
commit 599cebf8ad
5 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/admin/components/admin-report.js.es6
View File

@ -43,6 +43,7 @@ export default Ember.Component.extend({
isEnabled: true,
disabledLabel: "admin.dashboard.disabled",
isLoading: false,
rateLimitationString: null,
dataSourceName: null,
report: null,
model: null,
@ -303,7 +304,7 @@ export default Ember.Component.extend({
_fetchReport() {
this._super();
this.set("isLoading", true);
this.setProperties({ isLoading: true, rateLimitationString: null });
let payload = this._buildPayload(["prev_period"]);
@ -315,6 +316,12 @@ export default Ember.Component.extend({
console.log("failed loading", this.get("dataSource"));
}
})
.catch(data => {
if (data.jqXHR && data.jqXHR.status === 429) {
const error = data.jqXHR.responseJSON.errors[0];
this.set("rateLimitationString", error);
}
})
.finally(() => {
if (this.element && !this.isDestroying && !this.isDestroyed) {
this.set("isLoading", false);