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(orgAdmin): Add org admin teaser in org team page for non-enterprise orgs #10253

Merged
merged 13 commits into from
Oct 16, 2024

Conversation

tianrunhe
Copy link
Contributor

@tianrunhe tianrunhe commented Sep 18, 2024

Description

Fixes #10158

Demo

Screenshot 2024-09-26 at 14 24 57

Testing scenarios

  • Enterprise org

    • Go to http://localhost:3000/me/organizations/xxxx/teams for an enterprise org
    • See no teaser
  • Starter og

    • Go to http://localhost:3000/me/organizations/xxxx/teams for a starter org
    • See the teaser

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 Sep 18, 2024 that may be closed by this pull request
@github-actions github-actions bot added size/m and removed size/s labels Sep 26, 2024
@ackernaut
Copy link
Member

Hey @tianrunhe !

The screenshot looks good. I’m not able to see this locally. I have a team on the Starter plan. There are teams that either of 2 users aren’t on so they should see that there are hidden teams, yeah? I’m probably not doing something right.

@tianrunhe
Copy link
Contributor Author

There are teams that either of 2 users aren’t on

@ackernaut Are those teams under the same org? I can't seem to reproduce this.

So, here I have user A, B & C in the same "Test Org" (starter tier) 👇
Screenshot 2024-09-30 at 19 58 54

Each person is in their own's team: i.e., A has A's team with himself, B has B's team with himself, etc.
Here's A's view of the org admin page 👇
Screenshot 2024-09-30 at 19 56 44

B's view 👇
Screenshot 2024-09-30 at 19 57 20

And C's view 👇
Screenshot 2024-09-30 at 19 58 20

All seems correct to me?

@ackernaut
Copy link
Member

Yep, I was on the wrong org. Turns out all the Terry’s Orgs aren’t the same 😆 .

It looks good to me, nice work!

How do you set up an Enterprise account locally?

@tianrunhe
Copy link
Contributor Author

How do you set up an Enterprise account locally?

@ackernaut You can run the following mutation:

mutation {
  draftEnterpriseInvoice(orgId: "XXX", quantity: YY) {
    ...on DraftEnterpriseInvoicePayload {
      organization {
        name
      }
    }
  }
}

<Button
variant='primary'
shape='pill'
className='bg-pink-500 hover:bg-pink-600 px-6 py-2 text-base text-white'
Copy link
Contributor

Choose a reason for hiding this comment

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

+1 I personally find it to be too much on the nose. I know we want to encourage people to upgrade, but having this upgrade button so big and highlighted compared to the team rows feels like an ad. I think because it's very distinct from the other team rows already that it wouldn't harm to make the text paler and maybe smaller. @ackernaut what do you think?

Copy link
Member

Choose a reason for hiding this comment

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

I’m okay with subtle. We could yank the big button and put a link on Parabol Enterprise at the beginning of the sentence that takes them to the billing view. I think the text should stay the same to be legible in this case. Why make it hard to read why we are showing them the locked thing? I also think the lock icon could go a step down in scale so if it’s at 36 -> 24 or 24 -> 18.

Copy link
Member

Choose a reason for hiding this comment

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

@github-actions github-actions bot added size/s and removed size/m labels Oct 16, 2024
@tianrunhe tianrunhe merged commit ca069db into master Oct 16, 2024
6 checks passed
@tianrunhe tianrunhe deleted the feat/orgAdminTeaser branch October 16, 2024 21:47
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.

Non-Enterprise accounts see Org Admin teaser on Teams page
3 participants