Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(orgAdmins): show total user & team counts #10396

Merged
merged 11 commits into from
Oct 30, 2024
Merged

Conversation

tianrunhe
Copy link
Contributor

@tianrunhe tianrunhe commented Oct 22, 2024

Description

Fixes #10393

Demo

Screenshot 2024-10-22 at 15 08 44

Screenshot 2024-10-30 at 08 54 59

Testing scenarios

[Please list all the testing scenarios a reviewer has to check before approving the PR]

  • Organizations page show total user count

    • Go to http://localhost:3000/me/organizations
    • See total number of users displayed
  • Enterprise plan show total number of teams and users

    • Go to the billing page for an enterprise org: http://localhost:3000/me/organizations/xxxxx/billing
    • See total number of teams and users displayed above of plans

Final checklist

  • I checked the code review guidelines
  • I have added Metrics Representative as reviewer(s) if my PR invovles metrics/data/analytics related changes
  • I have performed a self-review of my code, the same way I'd do it for any other team member
  • I have tested all cases I listed in the testing scenarios and I haven't found any issues or regressions
  • Whenever I took a non-obvious choice I added a comment explaining why I did it this way
  • I added the label Skip Maintainer Review Indicating the PR only requires reviewer review and can be merged right after it's approved if the PR introduces only minor changes, does not contain any architectural changes or does not introduce any new patterns and I think one review is sufficient'
  • PR title is human readable and could be used in changelog

@tianrunhe tianrunhe linked an issue Oct 22, 2024 that may be closed by this pull request
@tianrunhe tianrunhe changed the title feat/10393/removeAUCount feat(orgAdmins): show total user & team counts Oct 22, 2024
<StyledRowInfoCopy>
{`${totalUsers} ${plural(totalUsers, 'User')} (${activeUserCount} Active)`}
</StyledRowInfoCopy>
<StyledRowInfoCopy>{`${totalUsers} ${plural(totalUsers, 'User')}`}</StyledRowInfoCopy>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-1 we're removing active for all users here. It's still relevant for Team users, so I think it should only be hidden for Enterprise users

@@ -131,6 +139,30 @@ const OrgPlans = (props: Props) => {
return (
<>
<StyledPanel label='Plans'>
{billingTier === 'enterprise' && (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 the plans section doesn't feel like the right place for this, to me. The plans explain what is offered in each tier, whereas this is information about usage.

I'm happy to still approve the PR if that's where you and @charlesmathias what to put it, but I'd suggest checking with @ackernaut first

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sooner or later I’d like to create a usage section that is separate from the tiers and plans setion(s). Kind of like variants we’ve explored here 🔒 . It doesn’t have to happen in this PR.

I would like to see the usage section always at the top, regardless of how the other sections appear or are ordered below. If we need to add some special case banner to alert something at the very top, probably something that can be dismissed, we can always consider that later.

@tianrunhe tianrunhe merged commit 4f515ea into master Oct 30, 2024
6 checks passed
@tianrunhe tianrunhe deleted the feat/10393/removeAUCount branch October 30, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update user/team count views for Enterprise organization
3 participants