TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 19:48:50 +03:00
Code Issues Projects Releases Wiki Activity

Fixed and improved members stats "debounced" fetches

Browse Source 
no issue

- the "days changed" logic was incorrect so we were always performing new fetches rather than using existing data
- added a minor improvement that returns an in-progress fetch promise if we have one and params haven't changed - avoids triggering unnecessary extra fetches in the rare occasions the chart is re-rendered before a previous stats fetch has finished
This commit is contained in:
Kevin Ansfield 2020-05-28 11:03:33 +01:00
parent f7034c7e91
commit 514034d329
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ghost/admin/app/services/members-stats.js
View File

@ -1,5 +1,6 @@
import Service from '@ember/service'; import Service from '@ember/service';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
export default class MembersStatsService extends Service { export default class MembersStatsService extends Service {
@ -9,26 +10,35 @@ export default class MembersStatsService extends Service {
@tracked stats = null; @tracked stats = null;
fetch({days}) { fetch({days}) {
// return existing stats unless data is > 1 min old let daysChanged = days !== this._days;
let daysChanged = days === this._days;
let staleData = this._lastFetched && this._lastFetched - new Date() > 1 * 60 * 1000; let staleData = this._lastFetched && this._lastFetched - new Date() > 1 * 60 * 1000;
// return an already in-progress promise unless params have changed
if (this._fetchTask.isRunning && !this._forceRefresh && !daysChanged) {
return this._fetchTask.last;
}
// return existing stats unless data is > 1 min old
if (this.stats && !this._forceRefresh && !daysChanged && !staleData) { if (this.stats && !this._forceRefresh && !daysChanged && !staleData) {
return Promise.resolve(this.stats); return Promise.resolve(this.stats);
} }
this._forceRefresh = false; return this._fetchTask.perform(...arguments);
this._days = days;
this._lastFetched = new Date();
let statsUrl = this.ghostPaths.url.api('members/stats');
return this.ajax.request(statsUrl, {data: {days}}).then((stats) => {
this.stats = stats;
return stats;
});
} }
invalidate() { invalidate() {
this._forceRefresh = true; this._forceRefresh = true;
} }
@task
*_fetchTask({days}) {
this._days = days;
this._lastFetched = new Date();
this._forceRefresh = false;
let statsUrl = this.ghostPaths.url.api('members/stats');
let stats = yield this.ajax.request(statsUrl, {data: {days}});
this.stats = stats;
return stats;
}
} }