From e492efb79e8fd8d8f8292c2fccd991d4448ac249 Mon Sep 17 00:00:00 2001 From: martmull Date: Tue, 17 Dec 2024 17:57:17 +0100 Subject: [PATCH] Remove serverless functions from settings (#9105) closes https://github.com/twentyhq/twenty/issues/8727 @Bonapara wants to keep the code for now so I ended up by setting the `isFunctionSettingsEnabled` constants to false in the codebase --- .../typeorm-seeds/core/feature-flags.ts | 2 +- .../serverless-function.resolver.ts | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) 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 4855f1451..6aceb8e32 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 @@ -38,7 +38,7 @@ export const seedFeatureFlags = async ( { key: FeatureFlagKey.IsFunctionSettingsEnabled, workspaceId: workspaceId, - value: true, + value: false, }, { key: FeatureFlagKey.IsWorkflowEnabled, diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts index 2df5d97ba..1493c9dc0 100644 --- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts +++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts @@ -35,17 +35,16 @@ export class ServerlessFunctionResolver { ) {} async checkFeatureFlag(workspaceId: string) { - const isFunctionSettingsEnabled = - await this.featureFlagRepository.findOneBy({ - workspaceId, - key: FeatureFlagKey.IsFunctionSettingsEnabled, - value: true, - }); + const isWorkflowEnabled = await this.featureFlagRepository.findOneBy({ + workspaceId, + key: FeatureFlagKey.IsWorkflowEnabled, + value: true, + }); - if (!isFunctionSettingsEnabled) { + if (!isWorkflowEnabled) { throw new ServerlessFunctionException( - `IS_FUNCTION_SETTINGS_ENABLED feature flag is not set to true for this workspace`, - ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND, + `IS_WORKFLOW_ENABLED feature flag is not set to true for this workspace`, + ServerlessFunctionExceptionCode.FEATURE_FLAG_INVALID, ); } }