Skip to content

The open alternative to Salesforce, designed for AI.

Complete Organization naming in settings and activation (#25961)

Thomas des Francsd7e0abfffe10
diff --git a/packages/twenty-docs/images/user-guide/billing/enterprise-key.png b/packages/twenty-docs/images/user-guide/billing/enterprise-key.png
index da1303ffaa6..8f189080a90 100644
Binary files a/packages/twenty-docs/images/user-guide/billing/enterprise-key.png and b/packages/twenty-docs/images/user-guide/billing/enterprise-key.png differ
diff --git a/packages/twenty-docs/images/user-guide/billing/organization-key.png b/packages/twenty-docs/images/user-guide/billing/organization-key.png
index da1303ffaa6..8f189080a90 100644
Binary files a/packages/twenty-docs/images/user-guide/billing/organization-key.png and b/packages/twenty-docs/images/user-guide/billing/organization-key.png differ
diff --git a/packages/twenty-docs/user-guide/billing/capabilities/pricing-plans.mdx b/packages/twenty-docs/user-guide/billing/capabilities/pricing-plans.mdx
index ee1a924ef9a..d742032f402 100644
--- a/packages/twenty-docs/user-guide/billing/capabilities/pricing-plans.mdx
+++ b/packages/twenty-docs/user-guide/billing/capabilities/pricing-plans.mdx
@@ -76,13 +76,15 @@ Premium features are only available on the Organization plans (Cloud or Self-Hos
## Get an Organization Key
-To use the Organization (Self-Hosted) plan, you need to obtain an Organization key:
+The Organization (Self-Hosted) plan runs on your own infrastructure. To get started, [install Twenty with Docker Compose](/developers/self-host/capabilities/docker-compose), then follow the steps below to activate your Organization license.
-1. Go to **Settings → Admin Panel → Enterprise**
+If you already have a self-hosted Twenty instance, you can get your Organization key directly from its settings:
+
+1. Go to **Settings → Admin Panel → Organization**
<img src="/images/user-guide/billing/organization-key.png" alt="Organization key" />
2. Click **Get Organization Key**
3. When you are redirected to Stripe, enter your payment details and confirm
-4. When your Organization key is displayed, paste it into the Enterprise settings page and activate the Organization license
+4. When your Organization key is displayed, paste it into the Organization settings page and activate the Organization license
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
index 413ecb6146c..b7f98a6012a 100644
--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -1130,7 +1130,7 @@ const createSettingsRouteElements = ({
path={SettingsPath.Enterprise}
element={
<Navigate
- to={getSettingsPath(SettingsPath.AdminPanelEnterprise)}
+ to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
replace
/>
}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx
index 4f41109ed24..1d72897e1dc 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx
@@ -28,7 +28,7 @@ export const SettingsAdminTabContent = ({
return <SettingsAdminConfigVariables />;
case SETTINGS_ADMIN_TABS.HEALTH_STATUS:
return <SettingsAdminHealthStatus />;
- case SETTINGS_ADMIN_TABS.ENTERPRISE:
+ case SETTINGS_ADMIN_TABS.ORGANIZATION:
return (
<Suspense fallback={<SettingsSectionSkeletonLoader />}>
<SettingsEnterprise isAdminPanelTab />
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts
index d8e5d2b60f0..500f2a423d6 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts
@@ -4,5 +4,5 @@ export const SETTINGS_ADMIN_TABS = {
AI: 'ai',
CONFIG_VARIABLES: 'config-variables',
HEALTH_STATUS: 'health-status',
- ENTERPRISE: 'enterprise',
+ ORGANIZATION: 'organization',
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useSettingsAdminTabs.ts b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useSettingsAdminTabs.ts
index 1c11cbe0c8c..7ab88b042cc 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useSettingsAdminTabs.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useSettingsAdminTabs.ts
@@ -54,8 +54,8 @@ export const useSettingsAdminTabs = () => {
...(!isBillingEnabled
? [
{
- id: SETTINGS_ADMIN_TABS.ENTERPRISE,
- title: t`Enterprise`,
+ id: SETTINGS_ADMIN_TABS.ORGANIZATION,
+ title: t`Organization`,
Icon: IconKey,
disabled: !canAccessFullAdminPanel && !canImpersonate,
},
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
index 69e02054a45..5f7101bccc6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
@@ -26,7 +26,7 @@ export const SettingsEnterpriseFeatureGateCard = ({
const canDisplayUpgradeButton = isBillingEnabled || canAccessAdminPanel;
const upgradeSettingsPath = isBillingEnabled
? SettingsPath.BillingPlans
- : SettingsPath.AdminPanelEnterprise;
+ : SettingsPath.AdminPanelOrganization;
return (
<Card rounded>
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
index 35bba42ca71..06662dd3cea 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
@@ -168,7 +168,7 @@ export const SettingsLogs = () => {
<SettingsOptionCardContentButton
Icon={IconLock}
title={t`Upgrade to access audit logs`}
- description={t`Only application logs are available on your current plan. Other log types require an Enterprise subscription.`}
+ description={t`Only application logs are available on your current plan. Other log types require an Organization subscription.`}
Button={
<Button
title={t`Upgrade`}
@@ -180,7 +180,7 @@ export const SettingsLogs = () => {
navigateSettings(
isBillingEnabled
? SettingsPath.BillingPlans
- : SettingsPath.AdminPanelEnterprise,
+ : SettingsPath.AdminPanelOrganization,
)
}
/>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
index 2936fb4ca65..5a770f43580 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
@@ -55,7 +55,7 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
<SettingsOptionCardContentButton
Icon={IconLock}
title={t`Upgrade to access`}
- description={t`This feature is part of the Enterprise Plan`}
+ description={t`This feature is part of the Organization plan`}
Button={
<Button
title={t`Upgrade`}
@@ -67,7 +67,7 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
navigateSettings(
isBillingEnabled
? SettingsPath.BillingPlans
- : SettingsPath.AdminPanelEnterprise,
+ : SettingsPath.AdminPanelOrganization,
)
}
/>
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
index 3efb95aaa25..1d51c0cddda 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
@@ -230,8 +230,8 @@ export const SettingsSecuritySettings = () => {
</Card>
) : (
<SettingsEnterpriseFeatureGateCard
- title={t`Enterprise feature`}
- description={t`Upgrade to Enterprise to access audit logs.`}
+ title={t`Organization feature`}
+ description={t`Upgrade to Organization to access audit logs.`}
buttonTitle={t`Activate`}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
index 5d81f6b5fd3..50f302ece22 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
@@ -6,17 +6,23 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';
import { useLingui } from '@lingui/react/macro';
+import { Navigate, useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
export const SettingsAdmin = () => {
const { t } = useLingui();
const tabs = useSettingsAdminTabs();
+ const location = useLocation();
const activeTabId = useSettingsActiveTabId(
SETTINGS_ADMIN_TABS_ID,
tabs.map((tab) => tab.id),
);
+ if (location.hash === '#enterprise') {
+ return <Navigate to={{ ...location, hash: '#organization' }} replace />;
+ }
+
return (
<SettingsPageLayout
title={t`Admin Panel`}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
index 8e5c4624181..932746f630e 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
@@ -352,7 +352,7 @@ export const SettingsAdminNewAiModel = () => {
accent="danger"
text={customAiProviderGateDescription}
buttonTitle={t`Activate`}
- to={getSettingsPath(SettingsPath.AdminPanelEnterprise)}
+ to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
index 134671a9a4e..294f5ba9a15 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
@@ -282,7 +282,7 @@ export const SettingsAdminNewAiProvider = () => {
accent="danger"
text={customAiProviderGateDescription}
buttonTitle={t`Activate`}
- to={getSettingsPath(SettingsPath.AdminPanelEnterprise)}
+ to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
index 2b8a955c2f4..af9e03c6483 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
@@ -333,7 +333,7 @@ export const SettingsEnterprise = ({
]);
const returnUrlPath = isAdminPanelTab
- ? getSettingsPath(SettingsPath.AdminPanelEnterprise)
+ ? getSettingsPath(SettingsPath.AdminPanelOrganization)
: getSettingsPath(SettingsPath.Enterprise);
const openBillingPortal = useCallback(async () => {
@@ -1034,13 +1034,13 @@ export const SettingsEnterprise = ({
return (
<SettingsPageLayout
- title={t`Enterprise`}
+ title={t`Organization`}
links={[
{
children: <Trans>Workspace</Trans>,
href: getSettingsPath(SettingsPath.General),
},
- { children: <Trans>Enterprise</Trans> },
+ { children: <Trans>Organization</Trans> },
]}
>
<SettingsPageContainer>{innerContent}</SettingsPageContainer>
diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.ts
index 43b50cea4b0..cf6a9e8972e 100644
--- a/packages/twenty-shared/src/types/SettingsPath.ts
+++ b/packages/twenty-shared/src/types/SettingsPath.ts
@@ -76,7 +76,7 @@ export enum SettingsPath {
NewSsoIdentityProvider = 'security/sso/new',
AdminPanel = 'admin-panel',
- AdminPanelEnterprise = 'admin-panel#enterprise',
+ AdminPanelOrganization = 'admin-panel#organization',
AdminPanelHealthStatus = 'admin-panel#health-status',
AdminPanelIndicatorHealthStatus = 'admin-panel/health-status/:indicatorId',
AdminPanelInferredVersion = 'admin-panel/health-status/inferred-version',
diff --git a/packages/twenty-website/next.config.ts b/packages/twenty-website/next.config.ts
index 49baa49842e..899a3e82797 100644
--- a/packages/twenty-website/next.config.ts
+++ b/packages/twenty-website/next.config.ts
@@ -119,6 +119,16 @@ const nextConfig: LinariaConfig = {
// Strip the source-locale prefix: /en/foo → /foo (301).
{ source: '/en', destination: '/', statusCode: 301 },
{ source: '/en/:path*', destination: '/:path*', statusCode: 301 },
+ {
+ source: '/enterprise/activate',
+ destination: '/organization/activate',
+ permanent: true,
+ },
+ {
+ source: `/:locale(${WEBSITE_LOCALE_LIST.join('|')})/enterprise/activate`,
+ destination: '/:locale/organization/activate',
+ permanent: true,
+ },
// /partners/list folded into the lead page, whose directory zone is the
// same grid. Both the unprefixed and the locale-prefixed URLs were in the
// sitemap, so both need the 308.
diff --git a/packages/twenty-website/src/app/[locale]/(site)/enterprise/activate/page.tsx b/packages/twenty-website/src/app/[locale]/(site)/organization/activate/page.tsx
similarity index 100%
rename from packages/twenty-website/src/app/[locale]/(site)/enterprise/activate/page.tsx
rename to packages/twenty-website/src/app/[locale]/(site)/organization/activate/page.tsx
diff --git a/packages/twenty-website/src/app/api/enterprise/activate/route.ts b/packages/twenty-website/src/app/api/enterprise/activate/route.ts
index ef0a58d0694..09c1485f665 100644
--- a/packages/twenty-website/src/app/api/enterprise/activate/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/activate/route.ts
@@ -17,7 +17,7 @@ export async function GET(request: Request) {
'[enterprise-activate] 503 — STRIPE_SECRET_KEY and/or ENTERPRISE_JWT_PRIVATE_KEY are not configured',
);
return NextResponse.json(
- { error: 'Enterprise activation is not configured.' },
+ { error: 'Organization activation is not configured.' },
{ status: 503 },
);
}
diff --git a/packages/twenty-website/src/app/api/enterprise/checkout/route.ts b/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
index 52f4bb709ce..951bbb7516e 100644
--- a/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
@@ -28,7 +28,7 @@ export async function POST(request: Request) {
const priceId = getEnterprisePriceId(billingInterval);
const websiteUrl = process.env.NEXT_PUBLIC_WEBSITE_URL;
const defaultSuccessUrl = websiteUrl
- ? `${websiteUrl}/enterprise/activate?session_id={CHECKOUT_SESSION_ID}`
+ ? `${websiteUrl}/organization/activate?session_id={CHECKOUT_SESSION_ID}`
: undefined;
const successUrl =
typeof body.successUrl === 'string' ? body.successUrl : defaultSuccessUrl;
diff --git a/packages/twenty-website/src/app/api/enterprise/portal/route.ts b/packages/twenty-website/src/app/api/enterprise/portal/route.ts
index f77a78e5b8f..fc1e57912fc 100644
--- a/packages/twenty-website/src/app/api/enterprise/portal/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/portal/route.ts
@@ -36,7 +36,7 @@ export async function POST(request: Request) {
if (!payload) {
return NextResponse.json(
- { error: 'Invalid enterprise key' },
+ { error: 'Invalid Organization key' },
{ status: 403 },
);
}
diff --git a/packages/twenty-website/src/app/api/enterprise/reissue/route.ts b/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
index 845815cbcd1..54b06cdbe97 100644
--- a/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
@@ -32,7 +32,7 @@ function isSecretValid(providedSecret: string): boolean {
export async function POST(request: Request) {
const configError = getEnterpriseConfigError({
route: 'enterprise-reissue',
- feature: 'Enterprise key reissue',
+ feature: 'Organization key reissue',
requiredEnvVars: [
'STRIPE_SECRET_KEY',
'ENTERPRISE_JWT_PRIVATE_KEY',
@@ -89,7 +89,7 @@ export async function POST(request: Request) {
return response;
} catch (error: unknown) {
- console.error('Enterprise key reissue failed', error);
+ console.error('Organization key reissue failed', error);
return NextResponse.json(
{ error: 'Internal server error' },
diff --git a/packages/twenty-website/src/app/api/enterprise/release/route.ts b/packages/twenty-website/src/app/api/enterprise/release/route.ts
index bab2b5a4bc6..7ba59b89b53 100644
--- a/packages/twenty-website/src/app/api/enterprise/release/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/release/route.ts
@@ -47,7 +47,7 @@ export async function POST(request: Request) {
if (!payload) {
return NextResponse.json(
- { error: 'Invalid enterprise key' },
+ { error: 'Invalid Organization key' },
{ status: 403 },
);
}
@@ -63,7 +63,7 @@ export async function POST(request: Request) {
if (!rateLimit.allowed) {
return NextResponse.json(
{
- error: `The release limit of ${getReleaseLimitPerWindow()} in the last 30 days has been reached for this enterprise key.`,
+ error: `The release limit of ${getReleaseLimitPerWindow()} in the last 30 days has been reached for this Organization key.`,
code: ENTERPRISE_RATE_LIMIT_CODE.RELEASE,
retryAfter: rateLimit.retryAfter.toISOString(),
},
diff --git a/packages/twenty-website/src/app/api/enterprise/seats/route.ts b/packages/twenty-website/src/app/api/enterprise/seats/route.ts
index f36de32a559..cfe43bb5c8a 100644
--- a/packages/twenty-website/src/app/api/enterprise/seats/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/seats/route.ts
@@ -49,7 +49,7 @@ export async function POST(request: Request) {
if (!payload) {
return NextResponse.json(
- { error: 'Invalid enterprise key' },
+ { error: 'Invalid Organization key' },
{ status: 403 },
);
}
diff --git a/packages/twenty-website/src/app/api/enterprise/status/route.ts b/packages/twenty-website/src/app/api/enterprise/status/route.ts
index 1a41b97b93b..2e9d88832b5 100644
--- a/packages/twenty-website/src/app/api/enterprise/status/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/status/route.ts
@@ -35,7 +35,7 @@ export async function POST(request: Request) {
if (!payload) {
return NextResponse.json(
- { error: 'Invalid enterprise key' },
+ { error: 'Invalid Organization key' },
{ status: 403 },
);
}
diff --git a/packages/twenty-website/src/app/api/enterprise/validate/route.ts b/packages/twenty-website/src/app/api/enterprise/validate/route.ts
index 5ce02e3564b..eb501d6762b 100644
--- a/packages/twenty-website/src/app/api/enterprise/validate/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/validate/route.ts
@@ -59,7 +59,7 @@ export async function POST(request: Request) {
if (!payload) {
return NextResponse.json(
- { error: 'Invalid enterprise key' },
+ { error: 'Invalid Organization key' },
{ status: 403 },
);
}
@@ -158,7 +158,7 @@ export async function POST(request: Request) {
isBillable: binding.isBillable,
});
} catch (error: unknown) {
- console.error('Enterprise key validation failed', error);
+ console.error('Organization key validation failed', error);
return NextResponse.json(
{ error: 'Internal server error' },
diff --git a/packages/twenty-website/src/platform/enterprise/resolve-server-binding.ts b/packages/twenty-website/src/platform/enterprise/resolve-server-binding.ts
index f624c452c33..c60e478f5b7 100644
--- a/packages/twenty-website/src/platform/enterprise/resolve-server-binding.ts
+++ b/packages/twenty-website/src/platform/enterprise/resolve-server-binding.ts
@@ -83,7 +83,7 @@ export function resolveServerBinding({
outcome: SERVER_BINDING_OUTCOME.REJECTED,
code: SERVER_BINDING_REJECTION_CODE.MISSING_SERVER_ID,
reason:
- 'This enterprise key is bound to a server instance, but this instance did not report a server identifier. Set SERVER_ID on this instance or release the binding to rebind it.',
+ 'This Organization key is bound to a server instance, but this instance did not report a server identifier. Set SERVER_ID on this instance or release the binding to rebind it.',
};
}
@@ -111,7 +111,7 @@ export function resolveServerBinding({
outcome: SERVER_BINDING_OUTCOME.REJECTED,
code: SERVER_BINDING_REJECTION_CODE.DEV_REQUIRES_ACTIVE_PRODUCTION,
reason:
- 'A free development instance requires an active production instance on this enterprise subscription.',
+ 'A free development instance requires an active production instance on this Organization subscription.',
};
}
@@ -140,7 +140,7 @@ export function resolveServerBinding({
outcome: SERVER_BINDING_OUTCOME.REJECTED,
code: SERVER_BINDING_REJECTION_CODE.DEV_SLOT_IN_USE,
reason:
- 'The development instance slot for this enterprise key is already in use on another server.',
+ 'The development instance slot for this Organization key is already in use on another server.',
};
}
@@ -169,6 +169,6 @@ export function resolveServerBinding({
outcome: SERVER_BINDING_OUTCOME.REJECTED,
code: SERVER_BINDING_REJECTION_CODE.BOUND_TO_ANOTHER_SERVER,
reason:
- 'This enterprise key is already in use on another server instance. Release it from that server or transfer it to this one.',
+ 'This Organization key is already in use on another server instance. Release it from that server or transfer it to this one.',
};
}
diff --git a/packages/twenty-website/src/platform/routing/organization-activation-redirects.test.ts b/packages/twenty-website/src/platform/routing/organization-activation-redirects.test.ts
new file mode 100644
index 00000000000..c3018ed84de
--- /dev/null
+++ b/packages/twenty-website/src/platform/routing/organization-activation-redirects.test.ts
@@ -0,0 +1,38 @@
+import { type NextConfig } from 'next';
+import { pathToRegexp } from 'next/dist/compiled/path-to-regexp';
+
+import nextConfig from '../../../next.config';
+
+jest.mock('@opennextjs/cloudflare', () => ({
+ initOpenNextCloudflareForDev: jest.fn(),
+}));
+jest.mock('next-with-linaria', () => ({
+ __esModule: true,
+ default: (config: NextConfig) => config,
+}));
+
+describe('Organization activation redirects', () => {
+ it.each([
+ ['/enterprise/activate', '/organization/activate'],
+ ['/fr/enterprise/activate', '/fr/organization/activate'],
+ ['/ja/enterprise/activate', '/ja/organization/activate'],
+ ])('redirects %s to %s', async (source, expectedDestination) => {
+ const redirects = await nextConfig.redirects!();
+ const redirect = redirects.find(
+ (candidate) =>
+ !candidate.has && pathToRegexp(candidate.source).test(source),
+ );
+
+ expect(redirect).toBeDefined();
+ expect(redirect?.permanent).toBe(true);
+
+ const keys: { name: string | number }[] = [];
+ const match = pathToRegexp(redirect!.source, keys).exec(source)!;
+ const destination = keys.reduce(
+ (path, key, index) => path.replace(`:${key.name}`, match[index + 1]),
+ redirect!.destination,
+ );
+
+ expect(destination).toBe(expectedDestination);
+ });
+});
diff --git a/packages/twenty-website/src/platform/routing/static-website-routes.ts b/packages/twenty-website/src/platform/routing/static-website-routes.ts
index cf85f43a02f..99d966d14d8 100644
--- a/packages/twenty-website/src/platform/routing/static-website-routes.ts
+++ b/packages/twenty-website/src/platform/routing/static-website-routes.ts
@@ -174,7 +174,7 @@ export const STATIC_WEBSITE_ROUTES: readonly WebsiteRoute[] = [
description: msg`Activate your Twenty Organization license after checkout and copy your key into your self-hosted instance.`,
id: 'enterpriseActivate',
indexed: false,
- path: '/enterprise/activate',
+ path: '/organization/activate',
priority: 0.3,
title: msg`Organization Activation | Twenty`,
},
diff --git a/packages/twenty-website/src/sections/enterprise-activate/EnterpriseActivateClient.tsx b/packages/twenty-website/src/sections/enterprise-activate/EnterpriseActivateClient.tsx
index 210034f33cc..983e7c463be 100644
--- a/packages/twenty-website/src/sections/enterprise-activate/EnterpriseActivateClient.tsx
+++ b/packages/twenty-website/src/sections/enterprise-activate/EnterpriseActivateClient.tsx
@@ -223,7 +223,7 @@ export function EnterpriseActivateClient() {
<li>
<Body size="sm">
{i18n._(
- msg`Open your Twenty self-hosted instance Settings → Admin Panel → Enterprise.`,
+ msg`Open your Twenty self-hosted instance Settings → Admin Panel → Organization.`,
)}
</Body>
</li>
diff --git a/packages/twenty-website/src/sections/pricing-plans/plans-data.ts b/packages/twenty-website/src/sections/pricing-plans/plans-data.ts
index 64f525678bd..16697526322 100644
--- a/packages/twenty-website/src/sections/pricing-plans/plans-data.ts
+++ b/packages/twenty-website/src/sections/pricing-plans/plans-data.ts
@@ -159,7 +159,7 @@ export const PLANS_DATA: Record<PlansTierId, PlansTier> = {
},
selfHost: {
href: SITE_URLS.docsSelfHostLicense,
- label: msg`Get a license`,
+ label: msg`Start for free`,
},
},
heading: { cloud: msg`Organization`, selfHost: msg`Organization` },