From 7b084ba46eac8b72f7d6bc8e94c5fd6b9be662a3 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Sat, 3 Feb 2024 08:55:29 +0100 Subject: [PATCH] Enable Rating Field (#3792) --- .../src/modules/workspace/types/FeatureFlagKey.ts | 1 - .../SettingsObjectNewFieldStep2.tsx | 9 --------- .../src/core/feature-flag/feature-flag.entity.ts | 1 - .../database/typeorm-seeds/core/demo/feature-flags.ts | 2 +- .../src/database/typeorm-seeds/core/feature-flags.ts | 4 ++-- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts index ecf85f0f4..1316f6e35 100644 --- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts +++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts @@ -1,5 +1,4 @@ export type FeatureFlagKey = | 'IS_MESSAGING_ENABLED' | 'IS_QUICK_ACTIONS_ENABLED' - | 'IS_RATING_FIELD_TYPE_ENABLED' | 'IS_NEW_RECORD_BOARD_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 463249886..d7bb1aedf 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 @@ -23,7 +23,6 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer' 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'; export const SettingsObjectNewFieldStep2 = () => { @@ -41,10 +40,6 @@ export const SettingsObjectNewFieldStep2 = () => { findActiveObjectMetadataItemBySlug(objectSlug); const { createMetadataField } = useFieldMetadataItem(); - const isRatingFieldTypeEnabled = useIsFeatureEnabled( - 'IS_RATING_FIELD_TYPE_ENABLED', - ); - const { formValues, handleFormChange, @@ -265,10 +260,6 @@ export const SettingsObjectNewFieldStep2 = () => { FieldMetadataType.Uuid, ]; - if (!isRatingFieldTypeEnabled) { - excludedFieldTypes.push(FieldMetadataType.Rating); - } - return ( diff --git a/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts index 91664dacf..5e579a452 100644 --- a/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts +++ b/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts @@ -15,7 +15,6 @@ import { Workspace } from 'src/core/workspace/workspace.entity'; export enum FeatureFlagKeys { IsMessagingEnabled = 'IS_MESSAGING_ENABLED', - IsRatingFieldTypeEnabled = 'IS_RATING_FIELD_TYPE_ENABLED', IsWorkspaceCleanable = 'IS_WORKSPACE_CLEANABLE', IsNewRecordBoardEnabled = 'IS_NEW_RECORD_BOARD_ENABLED', } diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/demo/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/demo/feature-flags.ts index 26cda4419..b0bffd176 100644 --- a/packages/twenty-server/src/database/typeorm-seeds/core/demo/feature-flags.ts +++ b/packages/twenty-server/src/database/typeorm-seeds/core/demo/feature-flags.ts @@ -16,7 +16,7 @@ export const seedFeatureFlags = async ( .orIgnore() .values([ { - key: FeatureFlagKeys.IsRatingFieldTypeEnabled, + key: FeatureFlagKeys.IsNewRecordBoardEnabled, workspaceId: workspaceId, value: false, }, 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 c496562a6..3d992d6fa 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 @@ -21,12 +21,12 @@ export const seedFeatureFlags = async ( value: true, }, { - key: FeatureFlagKeys.IsRatingFieldTypeEnabled, + key: FeatureFlagKeys.IsWorkspaceCleanable, workspaceId: workspaceId, value: true, }, { - key: FeatureFlagKeys.IsWorkspaceCleanable, + key: FeatureFlagKeys.IsNewRecordBoardEnabled, workspaceId: workspaceId, value: true, },