FIX: treats users_(by_type|tl) as other reports (#6391)
This commit is contained in:
parent
2ae7d3a118
commit
7bf8b0d305
|
@ -95,13 +95,11 @@
|
||||||
{{#conditional-loading-section isLoading=isLoading}}
|
{{#conditional-loading-section isLoading=isLoading}}
|
||||||
{{admin-report
|
{{admin-report
|
||||||
forcedModes="inline-table"
|
forcedModes="inline-table"
|
||||||
report=usersByTypeReport
|
dataSourceName="users_by_type"}}
|
||||||
lastRefreshedAt=lastRefreshedAt}}
|
|
||||||
|
|
||||||
{{admin-report
|
{{admin-report
|
||||||
forcedModes="inline-table"
|
forcedModes="inline-table"
|
||||||
report=usersByTrustLevelReport
|
dataSourceName="users_by_trust_level"}}
|
||||||
lastRefreshedAt=lastRefreshedAt}}
|
|
||||||
{{/conditional-loading-section}}
|
{{/conditional-loading-section}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ let _queue = [];
|
||||||
let _processing = 0;
|
let _processing = 0;
|
||||||
|
|
||||||
// max number of reports which will be requested in one bulk request
|
// 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
|
// max number of concurrent bulk requests
|
||||||
const MAX_CONCURRENCY = 3;
|
const MAX_CONCURRENCY = 3;
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
class AdminDashboardNextGeneralData < AdminDashboardNextData
|
class AdminDashboardNextGeneralData < AdminDashboardNextData
|
||||||
def reports
|
|
||||||
@reports ||= %w{
|
|
||||||
users_by_type
|
|
||||||
users_by_trust_level
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def get_json
|
def get_json
|
||||||
{
|
{
|
||||||
reports: self.class.reports(reports).compact,
|
|
||||||
updated_at: Time.zone.now.as_json
|
updated_at: Time.zone.now.as_json
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue