diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts index e243f4ff7..2e838d5db 100644 --- a/packages/twenty-front/src/generated-metadata/graphql.ts +++ b/packages/twenty-front/src/generated-metadata/graphql.ts @@ -460,7 +460,6 @@ export enum FeatureFlagKey { IsCopilotEnabled = 'IsCopilotEnabled', IsEventObjectEnabled = 'IsEventObjectEnabled', IsFreeAccessEnabled = 'IsFreeAccessEnabled', - IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled', IsJsonFilterEnabled = 'IsJsonFilterEnabled', IsLocalizationEnabled = 'IsLocalizationEnabled', IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled', diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx index 54fc0c64c..61ef99204 100644 --- a/packages/twenty-front/src/generated/graphql.tsx +++ b/packages/twenty-front/src/generated/graphql.tsx @@ -392,7 +392,6 @@ export enum FeatureFlagKey { IsCopilotEnabled = 'IsCopilotEnabled', IsEventObjectEnabled = 'IsEventObjectEnabled', IsFreeAccessEnabled = 'IsFreeAccessEnabled', - IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled', IsJsonFilterEnabled = 'IsJsonFilterEnabled', IsLocalizationEnabled = 'IsLocalizationEnabled', IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled', diff --git a/packages/twenty-front/src/modules/app/components/AppRouter.tsx b/packages/twenty-front/src/modules/app/components/AppRouter.tsx index 391142831..f4637d2c4 100644 --- a/packages/twenty-front/src/modules/app/components/AppRouter.tsx +++ b/packages/twenty-front/src/modules/app/components/AppRouter.tsx @@ -11,9 +11,9 @@ export const AppRouter = () => { const isFreeAccessEnabled = useIsFeatureEnabled( FeatureFlagKey.IsFreeAccessEnabled, ); - const isServerlessFunctionSettingsEnabled = useIsFeatureEnabled( - FeatureFlagKey.IsFunctionSettingsEnabled, - ); + + // We want to disable serverless function settings but keep the code for now + const isFunctionSettingsEnabled = false; const isBillingPageEnabled = billing?.isBillingEnabled && !isFreeAccessEnabled; @@ -26,7 +26,7 @@ export const AppRouter = () => { diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx index 4f8c3959b..2b1a7473b 100644 --- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx +++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx @@ -261,13 +261,13 @@ const SettingsLab = lazy(() => type SettingsRoutesProps = { isBillingEnabled?: boolean; - isServerlessFunctionSettingsEnabled?: boolean; + isFunctionSettingsEnabled?: boolean; isAdminPageEnabled?: boolean; }; export const SettingsRoutes = ({ isBillingEnabled, - isServerlessFunctionSettingsEnabled, + isFunctionSettingsEnabled, isAdminPageEnabled, }: SettingsRoutesProps) => ( }> @@ -305,7 +305,6 @@ export const SettingsRoutes = ({ /> } /> } /> - } @@ -322,7 +321,7 @@ export const SettingsRoutes = ({ path={SettingsPath.DevelopersNewWebhookDetail} element={} /> - {isServerlessFunctionSettingsEnabled && ( + {isFunctionSettingsEnabled && ( <> createBrowserRouter( @@ -62,9 +62,7 @@ export const useCreateAppRouter = ( element={ } diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx index 32113d19c..5fd9d1a8b 100644 --- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx +++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx @@ -55,9 +55,11 @@ export const SettingsNavigationDrawerItems = () => { const { t } = useLingui(); const billing = useRecoilValue(billingState); - const isFunctionSettingsEnabled = useIsFeatureEnabled( - FeatureFlagKey.IsFunctionSettingsEnabled, - ); + + // We want to disable this serverless function setting menu but keep the code + // for now + const isFunctionSettingsEnabled = false; + const isFreeAccessEnabled = useIsFeatureEnabled( FeatureFlagKey.IsFreeAccessEnabled, ); diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts index 976cbd980..e567c7e08 100644 --- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts +++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts @@ -35,11 +35,6 @@ export const seedFeatureFlags = async ( workspaceId: workspaceId, value: true, }, - { - key: FeatureFlagKey.IsFunctionSettingsEnabled, - workspaceId: workspaceId, - value: false, - }, { key: FeatureFlagKey.IsWorkflowEnabled, workspaceId: workspaceId, diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts index 00ab59655..c08b90e5e 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts @@ -5,7 +5,6 @@ export enum FeatureFlagKey { IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED', IsCopilotEnabled = 'IS_COPILOT_ENABLED', IsFreeAccessEnabled = 'IS_FREE_ACCESS_ENABLED', - IsFunctionSettingsEnabled = 'IS_FUNCTION_SETTINGS_ENABLED', IsWorkflowEnabled = 'IS_WORKFLOW_ENABLED', IsAnalyticsV2Enabled = 'IS_ANALYTICS_V2_ENABLED', IsUniqueIndexesEnabled = 'IS_UNIQUE_INDEXES_ENABLED',