Skip to content

Commit 36f753b

Browse files
jaffrepaulelylucas
andauthored
Cloud organizations revisions (#5244)
* copy tweak * remove pro org convert content * content updates * remove images, update new images * lint * update broken integration urls * Apply suggestions from code review Co-authored-by: Ely Lucas <[email protected]> * remove personal plan callout * remove old images * update ms teams callout * fix image property --------- Co-authored-by: Ely Lucas <[email protected]>
1 parent 7941223 commit 36f753b

20 files changed

+62
-95
lines changed

docs/guides/cloud/organizations.mdx

+62-95
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ title: Organizations
33
sidebar_position: 70
44
---
55

6-
Organizations are used to group projects and manage access to those projects.
6+
:::info
77

8-
<DocsImage
9-
src="/img/dashboard/organizations-listed-in-dashboard.png"
10-
alt="Organizations"
11-
width-600
12-
/>
8+
## <Icon name="graduation-cap" /> What you'll learn
9+
10+
- What an Organization ID is and how it is useful
11+
- How to manage Organizations
12+
- How to apply for an Open Source (OSS) plan
1313

14-
## Features
14+
:::
1515

16-
- Create projects
17-
- Invite users
18-
- Transfer projects
19-
- Pay for all of your projects usage.
16+
Organizations are used to group and manage projects. Here you can create
17+
projects, manage users, access billing and usage information, leverage third
18+
party integrations, and apply org-level settings.
2019

21-
### Organization ID
20+
## Organization ID
2221

2322
An Organization's ID is a unique identifier in
2423
[UUID](https://tools.ietf.org/html/rfc4122) format that can be found under the
@@ -43,61 +42,22 @@ You can create an organization from within
4342
switcher and clicking **<Icon name="plus" /> Create new organization**.
4443

4544
<DocsImage
46-
src="/img/dashboard/create-org.png"
45+
src="/img/guides/cloud/organizations/create-org.jpg"
4746
alt="Create new organization"
48-
width-600
49-
/>
50-
51-
<DocsImage
52-
src="/img/dashboard/add-organization-dialog.png"
53-
alt="Add Organization dialog"
54-
width-600
55-
/>
56-
57-
### Personal Org
58-
59-
In the past, every user of Cypress was given a personal organization - named
60-
after you. You cannot delete or edit the name of this personal organization,
61-
however you can convert it to a professional organization.
62-
63-
New users will no longer have a personal organization created for them
64-
automatically.
65-
66-
#### Convert to professional org
67-
68-
If you've already set up your projects, users, and billing on your personal
69-
organization, you can convert it to a professional organization via the
70-
**Organization settings** page.
71-
72-
<DocsImage
73-
src="/img/dashboard/convert-to-professional-org-button.jpg"
74-
alt="Convert org for billing"
75-
/>
76-
77-
Click the **Convert organization** button, provide a name for the organization,
78-
and hit **Convert organization**. This will do two things:
79-
80-
1. It will upgrade your personal organization to a new named organization. All
81-
of your projects, users, and billing information will carry over to this new
82-
organization.
83-
2. We'll create a new, empty personal organization so you always have a place to
84-
keep your side projects and experiments!
85-
86-
<DocsImage
87-
src="/img/dashboard/convert-to-professional-org-modal.jpg"
88-
alt="Convert org to new org"
89-
width-600
9047
/>
9148

9249
### Delete Org
9350

9451
You can delete organizations that you own as long as they do not have any
95-
projects in the organization. You must first transfer ownership of your projects
96-
to another organization before you can delete the organization.
52+
projects in the organization. You must first
53+
[delete](/guides/cloud/projects#Delete-Project) or
54+
[transfer ownership](/guides/cloud/projects#Transfer-ownership) of your projects
55+
your projects to another organization before you can delete the organization.
9756

9857
<DocsImage
99-
src="/img/dashboard/remove-organization-dialog.png"
58+
src="/img/guides/cloud/organizations/remove-organization-dialog.jpg"
10059
alt="Delete Organization"
60+
width="80%"
10161
/>
10262

10363
## Billing & Usage
@@ -119,44 +79,37 @@ your Organization must meet the following criteria:
11979

12080
### Requesting OSS plan for an Org
12181

122-
Follow the following process to request an OSS plan:
123-
12482
1. [Login](https://on.cypress.io/dashboard) to the Cypress Dashboard, or
12583
[create an account](https://on.cypress.io/dashboard) if you are a new user.
12684

127-
<DocsImage
128-
src="/img/dashboard/oss-plan-1-login.png"
129-
alt="Login or Create Account"
130-
/>
131-
13285
2. Go the [Organizations page](https://on.cypress.io/dashboard/organizations) to
13386
select the Organization you want to associate with an OSS plan. If you have
134-
no Organizations, you can create one by clicking the **+ Add Organization**
135-
button.
136-
137-
:::tip
138-
139-
**Note**: Personal organizations cannot be used with an OSS plan.
140-
141-
:::
87+
no Organizations, you can create one by clicking the **+ Create New
88+
Organization** button.
14289

143-
<DocsImage
144-
src="/img/dashboard/oss-plan-2-select-org.png"
145-
alt="Select or add organization"
146-
/>
90+
<DocsImage
91+
src="/img/guides/cloud/organizations/oss-plan-2-select-org.jpg"
92+
alt="Select or add organization"
93+
width="80%"
94+
/>
14795

148-
3. Go to the **Billing & Usage** page, and then click on the **Apply for an open
149-
source plan** link at the bottom of the page.
96+
3. Go to the **Billing & Usage** page, click **Upgrade** and then click on the
97+
**Apply for an open source plan** link at the bottom of the page. _Note:
98+
Access to all Projects must be set to **public** to enable this link._
15099

151100
<DocsImage
152-
src="/img/dashboard/oss-plan-3-billing.png"
101+
src="/img/guides/cloud/organizations/oss-plan-3-billing.jpg"
102+
alt="Upgrade Plan"
103+
/>
104+
<DocsImage
105+
src="/img/guides/cloud/organizations/oss-plan-4-billing.jpg"
153106
alt="Click Apply for an open source plan"
154107
/>
155108

156109
4. Fill in and submit the OSS plan request form.
157110

158111
<DocsImage
159-
src="/img/dashboard/oss-plan-4-apply.png"
112+
src="/img/guides/cloud/organizations/oss-plan-5-billing.jpg"
160113
alt="OSS plan request form"
161114
/>
162115

@@ -169,11 +122,30 @@ If you have any questions regarding the OSS plan, please feel free
169122

170123
## Integrations
171124

172-
- [BitBucket](/guides/cloud/integrations/bitbucket)
173-
- [GitHub](/guides/cloud/integrations/github)
174-
- [GitLab](/guides/cloud/integrations/gitlab)
175-
- [Jira](/guides/cloud/integrations/jira)
176-
- [Slack](/guides/cloud/integrations/slack)
125+
Owner and admin roles can integrate Cypress Cloud with many third party tools
126+
under **Organization > Integrations** and edit those settings from within the
127+
**Project settings** page.
128+
129+
See our integration guides to learn more:
130+
131+
### CI/CD
132+
133+
<!-- prettier-ignore-start -->
134+
135+
- &#8239;<Logo src="/img/logo/github.svg" /> [GitHub integration guide](/guides/cloud/integrations/github)
136+
- &#8239;<Logo src="/img/logo/gitlab.svg" /> [GitLab integration guide](/guides/cloud/integrations/gitlab)
137+
- &#8239;<Logo src="/img/logo/bitbucket.svg" /> [Bitbucket integration guide](/guides/cloud/integrations/bitbucket)
138+
139+
### Project Management
140+
141+
- &#8239;<Logo src="/img/logo/jira.svg" /> [Jira integration guide](/guides/cloud/integrations/jira)
142+
143+
### Messaging
144+
145+
- &#8239;<Logo src="/img/logo/slack.svg" /> [Cypress integration for Slack guide](/guides/cloud/integrations/slack)
146+
- &#8239;<Logo src="/img/logo/ms-teams.svg" /> [Cypress integration for Microsoft Teams guide](/guides/cloud/integrations/teams)
147+
148+
<!-- prettier-ignore-end -->
177149

178150
### Enterprise SSO
179151

@@ -202,12 +174,7 @@ Organization to set up SSO.
202174

203175
1. Log in to Cypress Cloud and navigate to the **Integrations** page for your
204176
organization.
205-
<DocsImage
206-
src="/img/dashboard/organizations/integrations-nenu-screenshot.png"
207-
alt="Enable SSO"
208-
width-600
209-
/>
210-
1. Scroll down to the **Enterprise SSO** section. Select your SSO provider and
177+
2. Scroll down to the **Enterprise SSO** section. Select your SSO provider and
211178
take note of the information provided and required. Keep this window open and
212179
continue to the
213180
[configuration instructions for your specific SSO provider](#SSO-Provider-Configuration)
@@ -249,7 +216,7 @@ below, refer to
249216
<DocsImage
250217
src="/img/dashboard/organizations/okta-add-application-step3-cypress-sso.png"
251218
alt="Create Okta SAML App"
252-
width-600
219+
width={600}
253220
/>
254221
1. Supply the following information requested in the Okta setup wizard:
255222

@@ -330,8 +297,8 @@ addition to the documentation below, refer to the Microsoft Guides for
330297

331298
#### Save Configuration
332299

333-
1. Return to Cypress Cloud and click **Save Configuration**. Cypress Cloud will
334-
attempt to authenticate.
300+
Return to Cypress Cloud and click **Save Configuration**. Cypress Cloud will
301+
attempt to authenticate.
335302

336303
🎉 Your integration is now complete! You can invite all of the users in your
337304
organization to sign in through your SSO provider.
-81.7 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

static/img/dashboard/create-org.png

-260 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-162 KB
Binary file not shown.
-267 KB
Binary file not shown.
-376 KB
Binary file not shown.
-240 KB
Binary file not shown.
Binary file not shown.
-273 KB
Binary file not shown.
-45.5 KB
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)