From a5a9e0e2385562609471ae0dda8feea26a75d1c9 Mon Sep 17 00:00:00 2001 From: Thomas Trompette Date: Fri, 3 May 2024 16:30:58 +0200 Subject: [PATCH] Remove isMultiSelect feature flag (#5280) As title Co-authored-by: Thomas Trompette --- .../src/modules/workspace/types/FeatureFlagKey.ts | 3 +-- .../SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx | 6 ------ .../src/database/typeorm-seeds/core/feature-flags.ts | 5 ----- .../engine/core-modules/feature-flag/feature-flag.entity.ts | 1 - .../commands/add-standard-id.command.ts | 2 -- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts index 10c009f0c..1b1021c1c 100644 --- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts +++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts @@ -4,5 +4,4 @@ export type FeatureFlagKey = | 'IS_QUICK_ACTIONS_ENABLED' | 'IS_EVENT_OBJECT_ENABLED' | 'IS_AIRTABLE_INTEGRATION_ENABLED' - | 'IS_POSTGRESQL_INTEGRATION_ENABLED' - | 'IS_MULTI_SELECT_ENABLED'; + | 'IS_POSTGRESQL_INTEGRATION_ENABLED'; diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx index 57f47afcb..8e9213868 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx @@ -28,7 +28,6 @@ import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; import { View } from '@/views/types/View'; import { ViewType } from '@/views/types/ViewType'; -import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; import { FieldMetadataType } from '~/generated-metadata/graphql'; import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull'; @@ -42,7 +41,6 @@ export const SettingsObjectNewFieldStep2 = () => { const navigate = useNavigate(); const { objectSlug = '' } = useParams(); const { enqueueSnackBar } = useSnackBar(); - const isMultiSelectEnabled = useIsFeatureEnabled('IS_MULTI_SELECT_ENABLED'); const { findActiveObjectMetadataItemBySlug, @@ -288,10 +286,6 @@ export const SettingsObjectNewFieldStep2 = () => { FieldMetadataType.Uuid, ]; - if (!isMultiSelectEnabled) { - excludedFieldTypes.push(FieldMetadataType.MultiSelect); - } - return ( 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 ad4a970b6..58dd9f6ee 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 @@ -40,11 +40,6 @@ export const seedFeatureFlags = async ( workspaceId: workspaceId, value: true, }, - { - key: FeatureFlagKeys.IsMultiSelectEnabled, - workspaceId: workspaceId, - value: true, - }, { key: FeatureFlagKeys.IsStripeIntegrationEnabled, workspaceId: workspaceId, diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts index 566063005..fc497266f 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts @@ -22,7 +22,6 @@ export enum FeatureFlagKeys { IsAirtableIntegrationEnabled = 'IS_AIRTABLE_INTEGRATION_ENABLED', IsPostgreSQLIntegrationEnabled = 'IS_POSTGRESQL_INTEGRATION_ENABLED', IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED', - IsMultiSelectEnabled = 'IS_MULTI_SELECT_ENABLED', } @Entity({ name: 'featureFlag', schema: 'core' }) diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts index e34269b72..28e0c87c1 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts @@ -58,7 +58,6 @@ export class AddStandardIdCommand extends CommandRunner { IS_EVENT_OBJECT_ENABLED: true, IS_AIRTABLE_INTEGRATION_ENABLED: true, IS_POSTGRESQL_INTEGRATION_ENABLED: true, - IS_MULTI_SELECT_ENABLED: false, IS_STRIPE_INTEGRATION_ENABLED: false, }, ); @@ -74,7 +73,6 @@ export class AddStandardIdCommand extends CommandRunner { IS_EVENT_OBJECT_ENABLED: true, IS_AIRTABLE_INTEGRATION_ENABLED: true, IS_POSTGRESQL_INTEGRATION_ENABLED: true, - IS_MULTI_SELECT_ENABLED: false, IS_STRIPE_INTEGRATION_ENABLED: false, }, );