refactor: have Graph.init and Graph.update return promises

v1.18.x
Julian Lam 4 years ago
parent f8e1a74c26
commit 3fa2e3cef2

@ -1,6 +1,6 @@
'use strict'; 'use strict';
define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress', 'api'], function (Chart, translator, Benchpress, api) { define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress', 'api', 'hooks'], function (Chart, translator, Benchpress, api, hooks) {
const Graph = { const Graph = {
_current: null, _current: null,
}; };
@ -16,7 +16,10 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
Chart.defaults.global.tooltips.enabled = false; Chart.defaults.global.tooltips.enabled = false;
} }
Graph.handleUpdateControls({ set });
var t = translator.Translator.create(); var t = translator.Translator.create();
return new Promise((resolve) => {
t.translateKey(`admin/menu:${ajaxify.data.template.name.replace('admin/', '')}`, []).then((key) => { t.translateKey(`admin/menu:${ajaxify.data.template.name.replace('admin/', '')}`, []).then((key) => {
const data = { const data = {
labels: trafficLabels, labels: trafficLabels,
@ -68,10 +71,15 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
}); });
if (!dataset) { if (!dataset) {
Graph.update(set); Graph.update(set).then(resolve);
} else {
resolve(Graph._current);
} }
}); });
});
};
Graph.handleUpdateControls = ({ set }) => {
$('[data-action="updateGraph"]:not([data-units="custom"])').on('click', function () { $('[data-action="updateGraph"]:not([data-units="custom"])').on('click', function () {
var until = new Date(); var until = new Date();
var amount = $(this).attr('data-amount'); var amount = $(this).attr('data-amount');
@ -151,9 +159,10 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
amount = ajaxify.data.query.count amount = ajaxify.data.query.count
) => { ) => {
if (!Graph._current) { if (!Graph._current) {
return; return Promise.reject(new Error('[[error:invalid-data]]'));
} }
return new Promise((resolve) => {
api.get(`/admin/analytics/${set}`, { units, until, amount }).then((dataset) => { api.get(`/admin/analytics/${set}`, { units, until, amount }).then((dataset) => {
if (units === 'days') { if (units === 'days') {
Graph._current.data.xLabels = utils.getDaysArray(until, amount); Graph._current.data.xLabels = utils.getDaysArray(until, amount);
@ -174,6 +183,11 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
}); });
apiEl.attr('href', `${config.relative_path}/api/v3/admin/analytics/${ajaxify.data.set}?${newHref}`); apiEl.attr('href', `${config.relative_path}/api/v3/admin/analytics/${ajaxify.data.set}?${newHref}`);
ajaxify.updateHistory(`${ajaxify.data.url.slice(1)}?${newHref}`, true); ajaxify.updateHistory(`${ajaxify.data.url.slice(1)}?${newHref}`, true);
hooks.fire('action:admin.dashboard.updateGraph', {
graph: Graph._current,
});
resolve(Graph._current);
});
}); });
}; };

Loading…
Cancel
Save