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

Rename teams to team plans #6011

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Rename teams to team plans #6011

merged 1 commit into from
Oct 4, 2021

Conversation

gtsiolis
Copy link
Contributor

@gtsiolis gtsiolis commented Oct 4, 2021

Description

This will rename the current Teams feature to Team Plans to avoid confusion with the upcoming Teams & Projects feature which will introduce a way to create a team and invite members. 🍵

We've decided to proceed with this MVC (minimum viable change) instead of adding a deprecation notice in #5121. 🙀

There's also a follow up PR to update the relevant docs section in https://github.com/gitpod-io/website/pull/1032.

https://www.gitpod.io/docs/teams

See relevant discussion points[1][2] (internal).

How to test

  1. Go to /teams
  2. Create a team plan, manage team members.

Release Notes

NONE

@gtsiolis gtsiolis added component: dashboard team: webapp Issue belongs to the WebApp team labels Oct 4, 2021
@roboquat roboquat requested a review from geropl October 4, 2021 13:29
@roboquat roboquat added the size/S label Oct 4, 2021
@gtsiolis gtsiolis requested review from jankeromnes and removed request for geropl and jankeromnes October 4, 2021 13:33
@@ -18,7 +18,7 @@ export default [
link: ['/plans']
},
{
title: 'Teams',
title: 'Team Plans',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

thought: Alternatively, this could read Subscriptions.

Copy link
Contributor

@jankeromnes jankeromnes Oct 4, 2021

Choose a reason for hiding this comment

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

So, the reason we initially went with "Plans" and not "Subscriptions" for the individual "Plans" page is:

  • An individual has only one Subscription with Gitpod (paid or not), but that Subscription can be upgraded/downgraded to various Plans (e.g. Open Source, Professional, Unleashed, etc)

So the page could have been called "Subscription" (singular) or "Plans" (plural). We felt "Plans" more appropriate, because that's exactly what this page shows you (a collection of available Plans for your unique Subscription).

For Teams, this is a bit more awkward, because you can possibly have up to three Team Subscriptions (one for each Team Plan).

I'm a bit more in favour of "Team Plans" (to be consistent with "Plans"), but I agree that this could also become "Team Subscriptions".

Copy link
Contributor

@jankeromnes jankeromnes left a comment

Choose a reason for hiding this comment

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

Looks good to me! Many thanks @gtsiolis 🙏

Please see small inline nits, otherwise good to merge 🚀

@@ -428,7 +428,7 @@ function AllTeams() {
<div className="flex flex-row">
<div className="flex-grow ">
<h3 className="self-center">All Teams</h3>
<h2>Manage teams and team members.</h2>
<h2>Manage team plan and team members.</h2>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<h2>Manage team plan and team members.</h2>
<h2>Manage team plans and team members.</h2>

@@ -428,7 +428,7 @@ function AllTeams() {
<div className="flex flex-row">
<div className="flex-grow ">
<h3 className="self-center">All Teams</h3>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<h3 className="self-center">All Teams</h3>
<h3 className="self-center">All Team Plans</h3>

@roboquat
Copy link
Contributor

roboquat commented Oct 4, 2021

LGTM label has been added.

Git tree hash: 1f7c929b50f4ad6a5b741e5f79e6312d96c4e202

@roboquat
Copy link
Contributor

roboquat commented Oct 4, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jankeromnes

Associated issue: #698

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@roboquat roboquat merged commit efb42e4 into main Oct 4, 2021
@roboquat roboquat deleted the gt/rename-teams-settings-menu branch October 4, 2021 13:37
@jankeromnes
Copy link
Contributor

jankeromnes commented Oct 4, 2021

Whoops, forgot about auto-merge... 😅 Anyway, please feel free to address the nits in a follow-up PR. Thanks again!

@gtsiolis
Copy link
Contributor Author

gtsiolis commented Oct 4, 2021

Oh, this got merged early! 🙀

Added follow-up PR in #6013.

Thanks for taking a look at this, @jankeromnes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants