From cc2590f4a69878b32f02ff752e86dae00fb1843e Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Thu, 25 Jul 2024 10:15:33 -0700 Subject: [PATCH 1/2] docs(core): Update setActive occurrences to state that org slug is also accepted --- docs/references/javascript/clerk/session-methods.mdx | 2 +- docs/references/react/use-organization-list.mdx | 2 +- docs/references/react/use-session-list.mdx | 2 +- docs/references/react/use-sign-in.mdx | 2 +- docs/references/react/use-sign-up.mdx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/references/javascript/clerk/session-methods.mdx b/docs/references/javascript/clerk/session-methods.mdx index 90e999bbce..3e3b7dfd38 100644 --- a/docs/references/javascript/clerk/session-methods.mdx +++ b/docs/references/javascript/clerk/session-methods.mdx @@ -24,7 +24,7 @@ function setActive({ | Name | Type | Description | | - | - | - | | `session?` | [`Session`](/docs/references/javascript/session) \| `string` \| `null` | The session resource or session ID (string version) to be set as active. If `null`, the current session is deleted. | -| `organization?` | [`Organization`](/docs/references/javascript/organization/organization) \| `string` \| `null` | The organization resource or organization ID (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | +| `organization?` | [`Organization`](/docs/references/javascript/organization/organization) \| `string` \| `null` | The organization resource or organization ID/slug (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | | `beforeEmit?` | `(session?: Session \| null) => void \| Promise` | Callback run just before the active session and/or organization is set to the passed object. Can be used to hook up for pre-navigation actions. | ### Example diff --git a/docs/references/react/use-organization-list.mdx b/docs/references/react/use-organization-list.mdx index ad3d4d44f4..4df59659ad 100644 --- a/docs/references/react/use-organization-list.mdx +++ b/docs/references/react/use-organization-list.mdx @@ -75,7 +75,7 @@ type OrganizationSuggestionStatus = "pending" | "accepted"; | Name | Type | Description | | - | - | - | | `session` | [Session](/docs/references/javascript/session) \| string \| null | The session resource or session ID (string version) to be set as active. If `null`, the current session is deleted. | -| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | +| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID/slug (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | | `beforeEmit?` | `(session?: Session \| null) => void \| Promise` | Callback run just before the active session and/or organization is set to the passed object. Can be used to hook up for pre-navigation actions. | ### `PaginatedResources` diff --git a/docs/references/react/use-session-list.mdx b/docs/references/react/use-session-list.mdx index e5155e656d..bc70c1ce78 100644 --- a/docs/references/react/use-session-list.mdx +++ b/docs/references/react/use-session-list.mdx @@ -20,7 +20,7 @@ The `useSessionList()` hook returns an array of [`Session`](/docs/references/jav | Name | Type | Description | | - | - | - | | `session` | [Session](/docs/references/javascript/session) \| string \| null | The session resource or session ID (string version) to be set as active. If `null`, the current session is deleted. | -| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | +| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID/slug (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | | `beforeEmit?` | `(session?: Session \| null) => void \| Promise` | Callback run just before the active session and/or organization is set to the passed object. Can be used to hook up for pre-navigation actions. | ## How to use the `useSessionList()` hook diff --git a/docs/references/react/use-sign-in.mdx b/docs/references/react/use-sign-in.mdx index d4c6f16e28..f074a0440b 100644 --- a/docs/references/react/use-sign-in.mdx +++ b/docs/references/react/use-sign-in.mdx @@ -20,7 +20,7 @@ The `useSignIn()` hook provides access to the [`SignIn`](/docs/references/javasc | Name | Type | Description | | - | - | - | | `session` | [Session](/docs/references/javascript/session) \| string \| null | The session resource or session ID (string version) to be set as active. If `null`, the current session is deleted. | -| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | +| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID/slug (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | | `beforeEmit?` | `(session?: Session \| null) => void \| Promise` | Callback run just before the active session and/or organization is set to the passed object. Can be used to hook up for pre-navigation actions. | ## How to use the `useSignIn()` hook diff --git a/docs/references/react/use-sign-up.mdx b/docs/references/react/use-sign-up.mdx index c70071cdc7..08d8f6e39a 100644 --- a/docs/references/react/use-sign-up.mdx +++ b/docs/references/react/use-sign-up.mdx @@ -20,7 +20,7 @@ The `useSignUp()` hook gives you access to the [`SignUp`](/docs/references/javas | Name | Type | Description | | - | - | - | | `session` | [Session](/docs/references/javascript/session) \| string \| null | The session resource or session ID (string version) to be set as active. If `null`, the current session is deleted. | -| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | +| `organization` | [Organization](/docs/references/javascript/organization/organization) \| string \| null | The organization resource or organization ID/slug (string version) to be set as active in the current session. If `null`, the currently active organization is removed as active. | | `beforeEmit?` | `(session?: Session \| null) => void \| Promise` | Callback run just before the active session and/or organization is set to the passed object. Can be used to hook up for pre-navigation actions. | ## How to use the `useSignUp()` hook From 505f258d9f3f82122c65f10f46bb16114597581e Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Thu, 1 Aug 2024 06:33:56 -0700 Subject: [PATCH 2/2] format organizations overview --- docs/organizations/overview.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/organizations/overview.mdx b/docs/organizations/overview.mdx index 6bd3ec565b..19022c5472 100644 --- a/docs/organizations/overview.mdx +++ b/docs/organizations/overview.mdx @@ -116,8 +116,8 @@ If you need more organizations or custom pricing, please contact [our sales team By default, users can create organizations within your application. To disable this permission for all users: 1. Navigate to the [Clerk Dashboard](https://dashboard.clerk.com/last-active?path=organizations-settings). -2. In the navigation sidebar, select **Organization Settings**. -3. At the bottom of the page, in the **Limit creation** section, toggle **Allow new users to create organizations** off. +1. In the navigation sidebar, select **Organization Settings**. +1. At the bottom of the page, in the **Limit creation** section, toggle **Allow new users to create organizations** off. If you want to only disable this permission for certain users, you can override it on a per-user basis on the user's profile page in the Clerk Dashboard: