Node.js based forum software built for the modern web
fix(admin/federation): add pie chart, no-data state, and legend spacing to analytics
Julian Lam0eda2d6b8d9b
diff --git a/public/language/en-GB/admin/settings/activitypub.json b/public/language/en-GB/admin/settings/activitypub.jsonindex 45cbb1f38e..c1c59ca65c 100644--- a/public/language/en-GB/admin/settings/activitypub.json+++ b/public/language/en-GB/admin/settings/activitypub.json@@ -104,6 +104,7 @@"analytics.hourly": "Hourly","analytics.daily": "Daily","analytics.activities_by_type": "Activities by Type",+ "analytics.activities_by_type_empty": "No activities recorded yet.","analytics.activities_by_type_not_filterable": "<strong>Note:</strong> This breakdown is global and not filtered by the selected hostname.","errors.intro": "The following %1 error(s) were recorded by this instance within the last 24 hours.",diff --git a/public/src/admin/federation/analytics.js b/public/src/admin/federation/analytics.jsindex 55308a54a1..db7837f40c 100644--- a/public/src/admin/federation/analytics.js+++ b/public/src/admin/federation/analytics.js@@ -90,7 +90,7 @@ async function renderActivitiesByTypeLegend() {return `<li class="mb-2"><span class="badge me-2" style="background-color: ${color};"> </span><span>${type}</span>- <span class="float-end">${count} (${pct}%)</span>+ <span class="float-end ms-2">${count} (${pct}%)</span></li>`;}).join('');@@ -165,6 +165,11 @@ async function initializeCharts() {receivedCanvas.width = $(receivedCanvas).parent().width();sentCanvas.width = $(sentCanvas).parent().width();+ const pieCanvas = document.getElementById('activitiesByType');+ if (pieCanvas) {+ pieCanvas.width = $(pieCanvas).parent().width();+ }+const chartOpts = {responsive: true,animation: false,@@ -180,6 +185,33 @@ async function initializeCharts() {},};+ const byType = ajaxify.data.data.byType;+ const pieEntries = Object.entries(byType)+ .filter(([, count]) => count > 0)+ .sort(([, a], [, b]) => b - a);+ const noDataContainer = $(pieCanvas).closest('.no-data-container');+ const noDataMessage = noDataContainer.find('.no-data-message');++ if (pieEntries.length === 0) {+ pieCanvas.style.display = 'none';+ noDataMessage.css('display', 'block');+ noDataContainer.css({+ display: 'flex',+ alignItems: 'center',+ justifyContent: 'center',+ });+ }++ const pieData = {+ labels: pieEntries.map(([type]) => type),+ datasets: [{+ data: pieEntries.map(([, count]) => count),+ backgroundColor: pieEntries.map(([, count], idx) =>+ pieColors[idx % pieColors.length]+ ),+ }],+ };+return new Map([['received', new Chart(receivedCanvas.getContext('2d'), {type: 'line',@@ -191,6 +223,19 @@ async function initializeCharts() {data: data.sent,options: chartOpts,})],+ ['activitiesByType', new Chart(pieCanvas.getContext('2d'), {+ type: 'pie',+ data: pieData,+ options: {+ responsive: true,+ animation: false,+ plugins: {+ legend: {+ display: false,+ },+ },+ },+ })],]);}diff --git a/src/views/admin/federation/analytics.tpl b/src/views/admin/federation/analytics.tplindex f6e246788c..94341d8d7b 100644--- a/src/views/admin/federation/analytics.tpl+++ b/src/views/admin/federation/analytics.tpl@@ -57,8 +57,11 @@<div class="card-body"><div class="row"><div class="col-md-6">- <div class="position-relative" style="aspect-ratio: 1;">- <canvas id="activitiesByType"></canvas>+ <div class="position-relative no-data-container w-100" style="aspect-ratio: 1;">+ <canvas id="activitiesByType" height="250"></canvas>+ <div class="no-data-message text-center text-muted" style="display: none;">+ <p class="mb-0">{{tx("admin/settings/activitypub:analytics.activities_by_type_empty")}}</p>+ </div></div></div><div class="col-md-6 d-flex align-items-center">