Skip to content

Rename teams to team plans #6011

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Rename teams to team plans #6011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions components/dashboard/src/settings/Teams.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<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>

</div>
<div className="flex flex-end space-x-3">
{isChargebeeCustomer && (
Expand Down Expand Up @@ -459,9 +459,9 @@ function AllTeams() {
{(getActiveSubs().length === 0 && !pendingPlanPurchase) && (
<div className="w-full flex h-80 mt-2 rounded-xl bg-gray-100 dark:bg-gray-900">
<div className="m-auto text-center">
<h3 className="self-center text-gray-500 dark:text-gray-400 mb-4">No Active Teams</h3>
<div className="text-gray-500 mb-6">Get started by creating a team<br /> and adding team members. <a href="https://www.gitpod.io/docs/teams/" target="_blank" rel="noopener" className="gp-link">Learn more</a></div>
<button className="self-center" onClick={() => showCreateTeamModal()}>Create Team</button>
<h3 className="self-center text-gray-500 dark:text-gray-400 mb-4">No Active Team Plans</h3>
<div className="text-gray-500 mb-6">Get started by creating a team plan<br /> and adding team members. <a href="https://www.gitpod.io/docs/teams/" target="_blank" rel="noopener" className="gp-link">Learn more</a></div>
<button className="self-center" onClick={() => showCreateTeamModal()}>Create Team Plan</button>
</div>
</div>
)}
Expand Down Expand Up @@ -526,7 +526,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 plans and team members.</h2>
</div>
</div>
)}
Expand Down Expand Up @@ -609,7 +609,7 @@ function AddMembersModal(props: {
return (<Modal visible={true} onClose={props.onClose}>
<h3 className="pb-2">Add Members</h3>
<div className="border-t border-b border-gray-200 dark:border-gray-800 mt-2 -mx-6 px-6 py-4">
<p className="pb-4 text-gray-500 text-base">Add members to the team.</p>
<p className="pb-4 text-gray-500 text-base">Add members to the team plan.</p>

<div className="flex flex-col space-y-2 pb-4">
<label htmlFor="quantity" className="font-medium">Members</label>
Expand Down Expand Up @@ -662,9 +662,9 @@ function NewTeamModal(props: {
}

return (<Modal visible={true} onClose={props.onClose}>
<h3 className="pb-2">New Team</h3>
<h3 className="pb-2">New Team Plan</h3>
<div className="border-t border-b border-gray-200 dark:border-gray-800 mt-2 -mx-6 px-6 py-4 space-y-2">
<p className="pb-4 text-gray-500 text-base">Create a team and add team members.</p>
<p className="pb-4 text-gray-500 text-base">Create a team plan and add team members.</p>

<div className="flex flex-col space-y-2">
<label htmlFor="type" className="font-medium">Team</label>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/settings/settings-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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".

link: ['/teams']
},
{
Expand Down