From 7bf8b0d305fd3da6360aa0f6d4ba5d5e91e9c7fa Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 13 Sep 2018 17:35:54 +0200 Subject: [PATCH] FIX: treats users_(by_type|tl) as other reports (#6391) --- .../admin/templates/dashboard_next_general.hbs | 6 ++---- .../javascripts/discourse/lib/reports-loader.js.es6 | 2 +- app/models/admin_dashboard_next_general_data.rb | 8 -------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs index 98ca3f03048..88f36a5d590 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs @@ -95,13 +95,11 @@ {{#conditional-loading-section isLoading=isLoading}} {{admin-report forcedModes="inline-table" - report=usersByTypeReport - lastRefreshedAt=lastRefreshedAt}} + dataSourceName="users_by_type"}} {{admin-report forcedModes="inline-table" - report=usersByTrustLevelReport - lastRefreshedAt=lastRefreshedAt}} + dataSourceName="users_by_trust_level"}} {{/conditional-loading-section}} diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 b/app/assets/javascripts/discourse/lib/reports-loader.js.es6 index bcdd564ef66..d6c090d69cc 100644 --- a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 +++ b/app/assets/javascripts/discourse/lib/reports-loader.js.es6 @@ -5,7 +5,7 @@ let _queue = []; let _processing = 0; // max number of reports which will be requested in one bulk request -const MAX_JOB_SIZE = 5; +const MAX_JOB_SIZE = 4; // max number of concurrent bulk requests const MAX_CONCURRENCY = 3; diff --git a/app/models/admin_dashboard_next_general_data.rb b/app/models/admin_dashboard_next_general_data.rb index 5cff33db700..f2137c47120 100644 --- a/app/models/admin_dashboard_next_general_data.rb +++ b/app/models/admin_dashboard_next_general_data.rb @@ -1,14 +1,6 @@ class AdminDashboardNextGeneralData < AdminDashboardNextData - def reports - @reports ||= %w{ - users_by_type - users_by_trust_level - } - end - def get_json { - reports: self.class.reports(reports).compact, updated_at: Time.zone.now.as_json } end