Correct Display of Billable Users on Users Statistics Page
What does this MR do?
Corrects the calculation for the Billable users row on the Users statistics page.
The calculation included bots and guest users. This MR corrects this by excluding bots and also excluding guest users for an ultimate license.
The Billable users row is also moved up to the non-bolded section, and an Active users row is added.
Issue: #292496 (closed)
Screenshots
After this MR
Users statistics page in EE
Users statistics page in FOSS
Notice Billable users does not appear. This is consistent with previous behavior where the Billable users row would appear as Active users in FOSS: https://gitlab.com/gitlab-org/gitlab/-/blob/2d956eda338732dece6881d1d2cd3e71cc75d30f/spec/features/admin/dashboard_spec.rb#L33
Before this MR
Users statistics page in EE
Notice that Billable users includes bots, guest users, and users without a project or group.
Users statistics page in FOSS
Does this MR meet the acceptance criteria?
Conformity
-
📋 Does this MR need a changelog?-
I have included a changelog entry. -
I have not included a changelog entry because _____.
-
-
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team