mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 05:33:07 +02:00
Implement federation chart
This commit is contained in:
parent
038bd100b2
commit
94ef03db9e
2 changed files with 38 additions and 8 deletions
|
@ -606,6 +606,9 @@ desktop/views/components/charts.vue:
|
||||||
drive: "ドライブ"
|
drive: "ドライブ"
|
||||||
network: "ネットワーク"
|
network: "ネットワーク"
|
||||||
charts:
|
charts:
|
||||||
|
federation: "フェデレーション"
|
||||||
|
federation-instances: "インスタンスの増減"
|
||||||
|
federation-instances-total: "インスタンスの積算"
|
||||||
notes: "投稿の増減 (統合)"
|
notes: "投稿の増減 (統合)"
|
||||||
local-notes: "投稿の増減 (ローカル)"
|
local-notes: "投稿の増減 (ローカル)"
|
||||||
remote-notes: "投稿の増減 (リモート)"
|
remote-notes: "投稿の増減 (リモート)"
|
||||||
|
|
|
@ -3,6 +3,10 @@
|
||||||
<header>
|
<header>
|
||||||
<b>%i18n:@title%:</b>
|
<b>%i18n:@title%:</b>
|
||||||
<select v-model="chartType">
|
<select v-model="chartType">
|
||||||
|
<optgroup label="%i18n:@federation%">
|
||||||
|
<option value="federation-instances">%i18n:@charts.federation-instances%</option>
|
||||||
|
<option value="federation-instances-total">%i18n:@charts.federation-instances-total%</option>
|
||||||
|
</optgroup>
|
||||||
<optgroup label="%i18n:@users%">
|
<optgroup label="%i18n:@users%">
|
||||||
<option value="users">%i18n:@charts.users%</option>
|
<option value="users">%i18n:@charts.users%</option>
|
||||||
<option value="users-total">%i18n:@charts.users-total%</option>
|
<option value="users-total">%i18n:@charts.users-total%</option>
|
||||||
|
@ -79,6 +83,8 @@ export default Vue.extend({
|
||||||
data(): any {
|
data(): any {
|
||||||
if (this.chart == null) return null;
|
if (this.chart == null) return null;
|
||||||
switch (this.chartType) {
|
switch (this.chartType) {
|
||||||
|
case 'federation-instances': return this.federationInstancesChart(false);
|
||||||
|
case 'federation-instances-total': return this.federationInstancesChart(true);
|
||||||
case 'users': return this.usersChart(false);
|
case 'users': return this.usersChart(false);
|
||||||
case 'users-total': return this.usersChart(true);
|
case 'users-total': return this.usersChart(true);
|
||||||
case 'notes': return this.notesChart('combined');
|
case 'notes': return this.notesChart('combined');
|
||||||
|
@ -109,11 +115,13 @@ export default Vue.extend({
|
||||||
this.now = new Date();
|
this.now = new Date();
|
||||||
|
|
||||||
const [perHour, perDay] = await Promise.all([Promise.all([
|
const [perHour, perDay] = await Promise.all([Promise.all([
|
||||||
|
(this as any).api('charts/federation', { limit: limit, span: 'hour' }),
|
||||||
(this as any).api('charts/users', { limit: limit, span: 'hour' }),
|
(this as any).api('charts/users', { limit: limit, span: 'hour' }),
|
||||||
(this as any).api('charts/notes', { limit: limit, span: 'hour' }),
|
(this as any).api('charts/notes', { limit: limit, span: 'hour' }),
|
||||||
(this as any).api('charts/drive', { limit: limit, span: 'hour' }),
|
(this as any).api('charts/drive', { limit: limit, span: 'hour' }),
|
||||||
(this as any).api('charts/network', { limit: limit, span: 'hour' })
|
(this as any).api('charts/network', { limit: limit, span: 'hour' })
|
||||||
]), Promise.all([
|
]), Promise.all([
|
||||||
|
(this as any).api('charts/federation', { limit: limit, span: 'day' }),
|
||||||
(this as any).api('charts/users', { limit: limit, span: 'day' }),
|
(this as any).api('charts/users', { limit: limit, span: 'day' }),
|
||||||
(this as any).api('charts/notes', { limit: limit, span: 'day' }),
|
(this as any).api('charts/notes', { limit: limit, span: 'day' }),
|
||||||
(this as any).api('charts/drive', { limit: limit, span: 'day' }),
|
(this as any).api('charts/drive', { limit: limit, span: 'day' }),
|
||||||
|
@ -122,16 +130,18 @@ export default Vue.extend({
|
||||||
|
|
||||||
const chart = {
|
const chart = {
|
||||||
perHour: {
|
perHour: {
|
||||||
users: perHour[0],
|
federation: perHour[0],
|
||||||
notes: perHour[1],
|
users: perHour[1],
|
||||||
drive: perHour[2],
|
notes: perHour[2],
|
||||||
network: perHour[3]
|
drive: perHour[3],
|
||||||
|
network: perHour[4]
|
||||||
},
|
},
|
||||||
perDay: {
|
perDay: {
|
||||||
users: perDay[0],
|
federation: perDay[0],
|
||||||
notes: perDay[1],
|
users: perDay[1],
|
||||||
drive: perDay[2],
|
notes: perDay[2],
|
||||||
network: perDay[3]
|
drive: perDay[3],
|
||||||
|
network: perDay[4]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -156,6 +166,23 @@ export default Vue.extend({
|
||||||
return arr.map((v, i) => ({ t: this.getDate(i).getTime(), y: v }));
|
return arr.map((v, i) => ({ t: this.getDate(i).getTime(), y: v }));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
federationInstancesChart(total: boolean): any {
|
||||||
|
return [{
|
||||||
|
datasets: [{
|
||||||
|
label: 'Instances',
|
||||||
|
fill: true,
|
||||||
|
backgroundColor: rgba(colors.localPlus),
|
||||||
|
borderColor: colors.localPlus,
|
||||||
|
borderWidth: 2,
|
||||||
|
pointBackgroundColor: '#fff',
|
||||||
|
lineTension: 0,
|
||||||
|
data: this.format(total
|
||||||
|
? this.stats.federation.instance.total
|
||||||
|
: sum(this.stats.federation.instance.inc, negate(this.stats.federation.instance.dec)))
|
||||||
|
}]
|
||||||
|
}];
|
||||||
|
},
|
||||||
|
|
||||||
notesChart(type: string): any {
|
notesChart(type: string): any {
|
||||||
return [{
|
return [{
|
||||||
datasets: [{
|
datasets: [{
|
||||||
|
|
Loading…
Reference in a new issue