The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove the email group flag and gate campaigns behind their own flag (#25916)
neo7738c283d46e8ef
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex e29a6b2a41f..0aa5936495c 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1987,7 +1987,7 @@ enum FeatureFlagKey {IS_UNIQUE_INDEXES_ENABLEDIS_CONFIGURABLE_SEARCH_FIELDS_ENABLEDIS_JSON_FILTER_ENABLED- IS_EMAIL_GROUP_ENABLED+ IS_MESSAGE_CAMPAIGN_ENABLEDIS_JUNCTION_RELATIONS_ENABLEDIS_REST_METADATA_API_NEW_FORMAT_DIRECTIS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLEDdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 2e59d660ae3..7193a388ebc 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1606,7 +1606,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'export interface WorkspaceUrls {customUrl?: Scalars['String']@@ -10715,7 +10715,7 @@ export const enumFeatureFlagKey = {IS_UNIQUE_INDEXES_ENABLED: 'IS_UNIQUE_INDEXES_ENABLED' as const,IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED: 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' as const,IS_JSON_FILTER_ENABLED: 'IS_JSON_FILTER_ENABLED' as const,- IS_EMAIL_GROUP_ENABLED: 'IS_EMAIL_GROUP_ENABLED' as const,+ IS_MESSAGE_CAMPAIGN_ENABLED: 'IS_MESSAGE_CAMPAIGN_ENABLED' as const,IS_JUNCTION_RELATIONS_ENABLED: 'IS_JUNCTION_RELATIONS_ENABLED' as const,IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED: 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' as const,diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex c59b459e02e..42033ec2bd6 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -412,11 +412,11 @@ export enum FeatureFlagKey {IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',- IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',+ IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 2ad909d093c..281f54bc59f 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -2037,11 +2037,11 @@ export enum FeatureFlagKey {IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',- IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',+ IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.tsindex 4a05d6d81a0..7d92d04886b 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts@@ -26,9 +26,9 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Partial<label: msg`JSON filters`,description: msg`Allow filtering records by values inside JSON fields.`,},- [FeatureFlagKey.IS_EMAIL_GROUP_ENABLED]: {+ [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: {label: msg`Email campaigns`,- description: msg`Enable email campaigns and sending domain management.`,+ description: msg`Enable email campaigns, lists, and unsubscribe management.`,},[FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT]: {label: msg`Direct REST metadata responses`,diff --git a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsxindex 7694e041219..e7b95668586 100644--- a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx+++ b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx@@ -1,4 +1,4 @@-import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';+import { SettingsPath } from 'twenty-shared/types';import { useAuth } from '@/auth/hooks/useAuth';import { currentUserState } from '@/auth/states/currentUserState';@@ -12,7 +12,6 @@ import {type NavigationDrawerItemModifier,} from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import {@@ -73,9 +72,6 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {isNonEmptyString(supportChat.supportFrontChatId);const permissionMap = usePermissionFlagMap();- const isEmailGroupFeatureEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,- );return [{label: t`User`,@@ -177,9 +173,7 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {label: t`Communication`,path: SettingsPath.WorkspaceCommunications,Icon: IconMessageCircle,- isHidden:- !isEmailGroupFeatureEnabled ||- !permissionMap[PermissionFlagType.WORKSPACE],+ isHidden: !permissionMap[PermissionFlagType.WORKSPACE],},],},diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsxindex 37078609325..18674c4a171 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx@@ -39,8 +39,8 @@ export const SettingsWorkspaceCommunications = () => {const navigateSettings = useNavigateSettings();- const isEmailGroupFeatureEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ const isMessageCampaignFeatureEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,);const tabs = [@@ -61,10 +61,6 @@ export const SettingsWorkspaceCommunications = () => {},];- if (!isEmailGroupFeatureEnabled) {- return null;- }-return (<SettingsPageLayouttitle={t`Communication`}@@ -92,24 +88,26 @@ export const SettingsWorkspaceCommunications = () => {/></Section><SettingsWorkspaceEmailGroupSection />- <Section>- <H2Title- title={t`Unsubscribe`}- description={t`Manage unsubscribers, opt-out topics, and the page recipients see`}- />- <StyledCardsColumn>- <SettingsCard- Icon={- <IconMailX- size={theme.icon.size.lg}- stroke={theme.icon.stroke.md}- />- }- title={t`Manage unsubscribe`}- onClick={() => navigateSettings(SettingsPath.Unsubscribe)}+ {isMessageCampaignFeatureEnabled && (+ <Section>+ <H2Title+ title={t`Unsubscribe`}+ description={t`Manage unsubscribers, opt-out topics, and the page recipients see`}/>- </StyledCardsColumn>- </Section>+ <StyledCardsColumn>+ <SettingsCard+ Icon={+ <IconMailX+ size={theme.icon.size.lg}+ stroke={theme.icon.stroke.md}+ />+ }+ title={t`Manage unsubscribe`}+ onClick={() => navigateSettings(SettingsPath.Unsubscribe)}+ />+ </StyledCardsColumn>+ </Section>+ )}</SettingsPageContainer></SettingsPageLayout>);diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsxindex 42a66aad082..eeacdbd9542 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx@@ -25,8 +25,8 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {const navigate = useNavigateSettings();const { enqueueErrorSnackBar } = useSnackBar();const { createUnsubscribeTopic, loading } = useCreateUnsubscribeTopic();- const isEmailGroupEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ const isMessageCampaignEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,);const [name, setName] = useState('');@@ -81,7 +81,7 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {t,]);- if (!isEmailGroupEnabled) {+ if (!isMessageCampaignEnabled) {return <NotFound />;}diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsxindex f45e1d2b50c..64d793d8e98 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx@@ -18,8 +18,8 @@ const UNSUBSCRIBE_TABS_INSTANCE_ID = 'settings-unsubscribe-tabs';export const SettingsWorkspaceUnsubscribe = () => {const { t } = useLingui();- const isEmailGroupEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ const isMessageCampaignEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,);const tabs = [@@ -45,7 +45,7 @@ export const SettingsWorkspaceUnsubscribe = () => {tabs.map((tab) => tab.id),);- if (!isEmailGroupEnabled) {+ if (!isMessageCampaignEnabled) {return null;}diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsxindex 718db96edd6..eb8408554d9 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx@@ -38,8 +38,8 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {const { updateUnsubscribeTopic } = useUpdateUnsubscribeTopic();const { deleteUnsubscribeTopic, loading: deleting } =useDeleteUnsubscribeTopic();- const isEmailGroupEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ const isMessageCampaignEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,);const unsubscribeTopic = unsubscribeTopics.find(@@ -62,7 +62,7 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {return <SettingsSkeletonLoader />;}- if (!isEmailGroupEnabled || !isDefined(unsubscribeTopic)) {+ if (!isMessageCampaignEnabled || !isDefined(unsubscribeTopic)) {return <NotFound />;}diff --git a/packages/twenty-front/src/testing/mock-data/generated/metadata/command-menu-items/mock-command-menu-items-data.ts b/packages/twenty-front/src/testing/mock-data/generated/metadata/command-menu-items/mock-command-menu-items-data.tsindex 931cfaa7518..4ab854c36bb 100644--- a/packages/twenty-front/src/testing/mock-data/generated/metadata/command-menu-items/mock-command-menu-items-data.ts+++ b/packages/twenty-front/src/testing/mock-data/generated/metadata/command-menu-items/mock-command-menu-items-data.ts@@ -1508,7 +1508,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] ="isPinned": false,"payload": null,"hotKeys": null,- "conditionalAvailabilityExpression": "featureFlags.IS_EMAIL_GROUP_ENABLED",+ "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED","availabilityType": "GLOBAL","availabilityObjectMetadataId": null,"pageLayoutId": null,@@ -1552,7 +1552,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] ="isPinned": true,"payload": null,"hotKeys": null,- "conditionalAvailabilityExpression": "pageType == \"INDEX_PAGE\" and featureFlags.IS_EMAIL_GROUP_ENABLED",+ "conditionalAvailabilityExpression": "pageType == \"INDEX_PAGE\" and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED","availabilityType": "GLOBAL_OBJECT_CONTEXT","availabilityObjectMetadataId": "1c5db583-0b37-4eed-a568-208372ecb0f0","pageLayoutId": null,@@ -1947,7 +1947,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] ="isPinned": false,"payload": null,"hotKeys": null,- "conditionalAvailabilityExpression": "featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageCampaign",+ "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign","availabilityType": "GLOBAL","availabilityObjectMetadataId": null,"pageLayoutId": null,@@ -1969,7 +1969,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] ="isPinned": false,"payload": null,"hotKeys": null,- "conditionalAvailabilityExpression": "featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageList",+ "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageList","availabilityType": "GLOBAL","availabilityObjectMetadataId": null,"pageLayoutId": null,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.tsindex 0c1f1483363..042723176f5 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts@@ -8,6 +8,7 @@ import { BackfillCoreVersionPointersCommand } from 'src/database/commands/upgradimport { MakeStandardChildObjectsInheritedCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789373200001-make-standard-child-objects-inherited.command';import { BackfillTimelineActivityMessageCampaignIndexesCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789461462000-backfill-timeline-activity-message-campaign-indexes.command';import { MakeNotesAndTasksInheritTheirTargetsCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789373200002-make-notes-and-tasks-inherit-their-targets.command';+import { MoveMessageCampaignCommandsToCampaignFlagCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789468244000-move-message-campaign-commands-to-campaign-flag.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.module';@@ -32,6 +33,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceMakeStandardChildObjectsInheritedCommand,MakeNotesAndTasksInheritTheirTargetsCommand,BackfillTimelineActivityMessageCampaignIndexesCommand,+ MoveMessageCampaignCommandsToCampaignFlagCommand,],})export class V2_41_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789468244000-move-message-campaign-commands-to-campaign-flag.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789468244000-move-message-campaign-commands-to-campaign-flag.command.tsnew file mode 100644index 00000000000..94d2bd3f02b--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789468244000-move-message-campaign-commands-to-campaign-flag.command.ts@@ -0,0 +1,88 @@+import { Command } from 'nest-commander';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { buildMessageCampaignFlagAvailabilityUpdates } from 'src/database/commands/upgrade-version-command/2-41/utils/build-message-campaign-flag-availability-updates.util';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';++@RegisteredWorkspaceCommand('2.41.0', 1789468244000)+@Command({+ name: 'upgrade:2-41:move-message-campaign-commands-to-campaign-flag',+ description:+ 'Gate the campaign and list command menu items behind IS_MESSAGE_CAMPAIGN_ENABLED instead of IS_EMAIL_GROUP_ENABLED',+})+export class MoveMessageCampaignCommandsToCampaignFlagCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const { flatCommandMenuItemMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatCommandMenuItemMaps',+ ]);++ const commandMenuItemsToUpdate =+ buildMessageCampaignFlagAvailabilityUpdates({+ flatCommandMenuItemByUniversalIdentifier:+ flatCommandMenuItemMaps.byUniversalIdentifier,+ now: new Date().toISOString(),+ });++ if (commandMenuItemsToUpdate.length === 0) {+ return;+ }++ if (options.dryRun ?? false) {+ this.logger.log(+ `[DRY RUN] Workspace ${workspaceId}: ${commandMenuItemsToUpdate.length} command menu item(s) to move to the campaign flag`,+ );++ return;+ }++ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ const result =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(+ {+ isSystemBuild: true,+ workspaceId,+ applicationUniversalIdentifier:+ twentyStandardFlatApplication.universalIdentifier,+ allFlatEntityOperationByMetadataName: {+ commandMenuItem: {+ flatEntityToCreate: [],+ flatEntityToDelete: [],+ flatEntityToUpdate: commandMenuItemsToUpdate,+ },+ },+ },+ );++ if (result.status === 'fail') {+ this.logger.error(+ `Failed to move the campaign command menu items to the campaign flag:\n${JSON.stringify(result, null, 2)}`,+ );++ throw new Error(+ `Failed to move the campaign command menu items to the campaign flag for workspace ${workspaceId}`,+ );+ }+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/__tests__/build-message-campaign-flag-availability-updates.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/__tests__/build-message-campaign-flag-availability-updates.util.spec.tsnew file mode 100644index 00000000000..1694c24263a--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/__tests__/build-message-campaign-flag-availability-updates.util.spec.ts@@ -0,0 +1,105 @@+import {+ getSystemNavigationCommandMenuItemUniversalIdentifier,+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,+} from 'twenty-shared/application';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';++import { buildMessageCampaignFlagAvailabilityUpdates } from 'src/database/commands/upgrade-version-command/2-41/utils/build-message-campaign-flag-availability-updates.util';+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';+import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';++const NOW = '2026-09-14T00:00:00.000Z';++const buildExistingItem = (+ universalIdentifier: string,+ conditionalAvailabilityExpression: string | null,+): FlatCommandMenuItem =>+ ({+ universalIdentifier,+ conditionalAvailabilityExpression,+ updatedAt: '2025-01-01T00:00:00.000Z',+ }) as FlatCommandMenuItem;++describe('buildMessageCampaignFlagAvailabilityUpdates', () => {+ it('moves a campaign action from the email group flag to the campaign flag and keeps the rest of the expression', () => {+ const { universalIdentifier } = STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign;++ const updates = buildMessageCampaignFlagAvailabilityUpdates({+ flatCommandMenuItemByUniversalIdentifier: {+ [universalIdentifier]: buildExistingItem(+ universalIdentifier,+ 'numberOfSelectedRecords == 1 and featureFlags.IS_EMAIL_GROUP_ENABLED',+ ),+ },+ now: NOW,+ });++ expect(updates).toEqual([+ expect.objectContaining({+ universalIdentifier,+ conditionalAvailabilityExpression:+ 'numberOfSelectedRecords == 1 and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',+ updatedAt: NOW,+ }),+ ]);+ });++ it('moves the campaign and list navigation items of the standard application', () => {+ const universalIdentifier =+ getSystemNavigationCommandMenuItemUniversalIdentifier({+ objectMetadataApplicationUniversalIdentifier:+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,+ objectUniversalIdentifier: STANDARD_OBJECTS.messageList.universalIdentifier,+ });++ const updates = buildMessageCampaignFlagAvailabilityUpdates({+ flatCommandMenuItemByUniversalIdentifier: {+ [universalIdentifier]: buildExistingItem(+ universalIdentifier,+ 'featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageList',+ ),+ },+ now: NOW,+ });++ expect(updates).toEqual([+ expect.objectContaining({+ conditionalAvailabilityExpression:+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageList',+ }),+ ]);+ });++ it('leaves untouched an item that no longer references the email group flag or is absent', () => {+ const { universalIdentifier } =+ STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign;++ expect(+ buildMessageCampaignFlagAvailabilityUpdates({+ flatCommandMenuItemByUniversalIdentifier: {+ [universalIdentifier]: buildExistingItem(+ universalIdentifier,+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',+ ),+ },+ now: NOW,+ }),+ ).toEqual([]);+ });++ it('never rewrites an item outside the campaign set even when it uses the email group flag', () => {+ const universalIdentifier = 'unrelated-command-menu-item';++ expect(+ buildMessageCampaignFlagAvailabilityUpdates({+ flatCommandMenuItemByUniversalIdentifier: {+ [universalIdentifier]: buildExistingItem(+ universalIdentifier,+ 'featureFlags.IS_EMAIL_GROUP_ENABLED',+ ),+ },+ now: NOW,+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/build-message-campaign-flag-availability-updates.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/build-message-campaign-flag-availability-updates.util.tsnew file mode 100644index 00000000000..2f1d7728c7e--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/utils/build-message-campaign-flag-availability-updates.util.ts@@ -0,0 +1,72 @@+import { isNonEmptyString } from '@sniptt/guards';+import {+ getSystemNavigationCommandMenuItemUniversalIdentifier,+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,+} from 'twenty-shared/application';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { isDefined } from 'twenty-shared/utils';++import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';+import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';++const PREVIOUS_FLAG_EXPRESSION = 'featureFlags.IS_EMAIL_GROUP_ENABLED';++const NEXT_FLAG_EXPRESSION = 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED';++const MESSAGE_CAMPAIGN_COMMAND_MENU_ITEM_UNIVERSAL_IDENTIFIERS = [+ STANDARD_COMMAND_MENU_ITEMS.composeCampaign.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.composeCampaignPinned.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaignTest.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageCampaign.universalIdentifier,+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageList.universalIdentifier,+ ...[+ STANDARD_OBJECTS.messageCampaign.universalIdentifier,+ STANDARD_OBJECTS.messageList.universalIdentifier,+ ].map((objectUniversalIdentifier) =>+ getSystemNavigationCommandMenuItemUniversalIdentifier({+ objectMetadataApplicationUniversalIdentifier:+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,+ objectUniversalIdentifier,+ }),+ ),+];++export const buildMessageCampaignFlagAvailabilityUpdates = ({+ flatCommandMenuItemByUniversalIdentifier,+ now,+}: {+ flatCommandMenuItemByUniversalIdentifier: Record<+ string,+ FlatCommandMenuItem | undefined+ >;+ now: string;+}): FlatCommandMenuItem[] =>+ MESSAGE_CAMPAIGN_COMMAND_MENU_ITEM_UNIVERSAL_IDENTIFIERS.flatMap(+ (universalIdentifier) => {+ const existingCommandMenuItem =+ flatCommandMenuItemByUniversalIdentifier[universalIdentifier];++ const existingExpression =+ existingCommandMenuItem?.conditionalAvailabilityExpression;++ if (+ !isDefined(existingCommandMenuItem) ||+ !isNonEmptyString(existingExpression) ||+ !existingExpression.includes(PREVIOUS_FLAG_EXPRESSION)+ ) {+ return [];+ }++ return [+ {+ ...existingCommandMenuItem,+ conditionalAvailabilityExpression: existingExpression+ .split(PREVIOUS_FLAG_EXPRESSION)+ .join(NEXT_FLAG_EXPRESSION),+ updatedAt: now,+ },+ ];+ },+ );diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.tsindex 05c48c065b8..6e24e60c10f 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts@@ -2,7 +2,6 @@ import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';import { Args, Mutation, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';-import { FeatureFlagKey } from 'twenty-shared/types';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { CreateEmailingDomainInput } from 'src/engine/core-modules/emailing-domain/dtos/create-emailing-domain.input';@@ -14,16 +13,11 @@ import { EmailingDomainService } from 'src/engine/core-modules/emailing-domain/simport { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import {- FeatureFlagGuard,- RequireFeatureFlag,-} from 'src/engine/guards/feature-flag.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@UseGuards(WorkspaceAuthGuard,- FeatureFlagGuard,SettingsPermissionGuard(PermissionFlagType.WORKSPACE),)@UseFilters(@@ -39,7 +33,6 @@ export class EmailingDomainResolver {) {}@Mutation(() => EmailingDomainDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)async createEmailingDomain(@Args('input') input: CreateEmailingDomainInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -56,7 +49,6 @@ export class EmailingDomainResolver {}@Mutation(() => Boolean)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)async deleteEmailingDomain(@Args('id') id: string,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -69,7 +61,6 @@ export class EmailingDomainResolver {}@Mutation(() => EmailingDomainDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)async verifyEmailingDomain(@Args('id') id: string,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -86,7 +77,6 @@ export class EmailingDomainResolver {}@Query(() => [EmailingDomainDTO])- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)async getEmailingDomains(@AuthWorkspace() currentWorkspace: WorkspaceEntity,): Promise<EmailingDomainDTO[]> {diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-flat-command-menu-item.util.spec.tsindex b02ebb20c9d..c5ff9e1f3e7 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-flat-command-menu-item.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-flat-command-menu-item.util.spec.ts@@ -152,7 +152,7 @@ describe('buildObjectNavigationFlatCommandMenuItem', () => {});expect(result.conditionalAvailabilityExpression).toBe(- 'featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageCampaign',+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign',);});diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.tsindex 82140411c10..525700540b1 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts@@ -11,7 +11,7 @@ describe('buildNavigationConditionalAvailabilityExpression', () => {nameSingular: 'messageCampaign',}),).toBe(- 'featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageCampaign',+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign',);});diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.tsindex 4f3f770da57..c276002debc 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts@@ -29,9 +29,9 @@ const NAVIGATION_FEATURE_FLAG_GATE_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<Record<string, FeatureFlagKey>> = {[STANDARD_OBJECTS.messageCampaign.universalIdentifier]:- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,[STANDARD_OBJECTS.messageList.universalIdentifier]:- FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,};const NAVIGATION_HIDING_FEATURE_FLAG_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex 8539f535af7..6d973d445cf 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -6,9 +6,9 @@ const tableName = 'featureFlag';const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {[FeatureFlagKey.IS_APP_CLAIMING_ENABLED]: false,[FeatureFlagKey.IS_UNIQUE_INDEXES_ENABLED]: false,- [FeatureFlagKey.IS_EMAIL_GROUP_ENABLED]: true,[FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED]: true,[FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED]: true,+ [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: true,[FeatureFlagKey.IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED]: false,[FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED]: false,[FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: false,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.tsindex a3b6613a841..db43298567c 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts@@ -957,7 +957,8 @@ export const STANDARD_COMMAND_MENU_ITEMS = {msg({ message: `Campaign`, context: 'commandMenuItem.shortLabel' }),),availabilityType: CommandMenuItemAvailabilityType.GLOBAL,- conditionalAvailabilityExpression: 'featureFlags.IS_EMAIL_GROUP_ENABLED',+ conditionalAvailabilityExpression:+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',availabilityObjectMetadataUniversalIdentifier: null,frontComponentUniversalIdentifier: null,engineComponentKey: EngineComponentKey.COMPOSE_CAMPAIGN,@@ -976,7 +977,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.GLOBAL_OBJECT_CONTEXT,conditionalAvailabilityExpression:- 'pageType == "INDEX_PAGE" and featureFlags.IS_EMAIL_GROUP_ENABLED',+ 'pageType == "INDEX_PAGE" and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',availabilityObjectMetadataUniversalIdentifier:STANDARD_OBJECTS.messageCampaign.universalIdentifier,frontComponentUniversalIdentifier: null,@@ -996,7 +997,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:- 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_EMAIL_GROUP_ENABLED',+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',availabilityObjectMetadataUniversalIdentifier:STANDARD_OBJECTS.messageCampaign.universalIdentifier,frontComponentUniversalIdentifier: null,@@ -1016,7 +1017,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:- 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_EMAIL_GROUP_ENABLED',+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',availabilityObjectMetadataUniversalIdentifier:STANDARD_OBJECTS.messageCampaign.universalIdentifier,frontComponentUniversalIdentifier: null,@@ -1036,7 +1037,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:- 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "SCHEDULED") or everyEquals(selectedRecords, "status", "SENDING")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_EMAIL_GROUP_ENABLED',+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "SCHEDULED") or everyEquals(selectedRecords, "status", "SENDING")) and noneDefined(selectedRecords, "deletedAt") and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',availabilityObjectMetadataUniversalIdentifier:STANDARD_OBJECTS.messageCampaign.universalIdentifier,frontComponentUniversalIdentifier: null,@@ -1056,7 +1057,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:- 'numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords and featureFlags.IS_EMAIL_GROUP_ENABLED',+ 'numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',// A sent campaign is the one people re-run, so the button is only pinned// there; drafts keep it in the menu.conditionalPinnedExpression:@@ -1526,7 +1527,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:- 'featureFlags.IS_EMAIL_GROUP_ENABLED and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords',+ 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords',availabilityObjectMetadataUniversalIdentifier:STANDARD_OBJECTS.messageList.universalIdentifier,frontComponentUniversalIdentifier: null,diff --git a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.tsindex 579ca7b03b9..9375de646d7 100644--- a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts+++ b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts@@ -64,7 +64,6 @@ export class EmailingSendResolver {) {}@Mutation(() => SendEmailViaDomainOutputDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)async sendEmailViaEmailingDomain(@Args('input') input: SendEmailViaDomainInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -93,7 +92,7 @@ export class EmailingSendResolver {}@Mutation(() => SendMessageCampaignOutputDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async sendMessageCampaign(@Args('input') input: SendMessageCampaignInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -121,7 +120,7 @@ export class EmailingSendResolver {}@Mutation(() => CancelMessageCampaignOutputDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async cancelMessageCampaign(@Args('input') input: CancelMessageCampaignInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -137,7 +136,7 @@ export class EmailingSendResolver {}@Mutation(() => SendEmailViaDomainOutputDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async sendMessageCampaignTest(@Args('input') input: SendMessageCampaignTestInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -162,7 +161,7 @@ export class EmailingSendResolver {}@Query(() => CampaignAudiencePreviewDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async previewMessageCampaignAudience(@Args('input') input: PreviewMessageCampaignAudienceInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.tsindex 8ae835166cc..2fbe845855f 100644--- a/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts+++ b/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts@@ -35,7 +35,7 @@ export class MessageListResolver {@Mutation(() => DuplicatedMessageListDTO)@UseGuards(NoPermissionGuard)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async duplicateMessageList(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthUserWorkspaceId() userWorkspaceId: string,diff --git a/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.tsindex 420e604cce4..14c81ab11c5 100644--- a/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts+++ b/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts@@ -44,7 +44,7 @@ export class MessageSuppressionResolver {) {}@Query(() => MessageSuppressionListDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async messageSuppressions(@Args('input') input: FindMessageSuppressionsInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -62,7 +62,7 @@ export class MessageSuppressionResolver {}@Mutation(() => MessageSuppressionDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async createMessageSuppression(@Args('input') input: CreateMessageSuppressionInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -77,7 +77,7 @@ export class MessageSuppressionResolver {}@Mutation(() => Boolean)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async deleteMessageSuppression(@Args('id', { type: () => UUIDScalarType }) suppressionId: string,@AuthWorkspace() currentWorkspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.tsindex 42491314e83..c080b813af2 100644--- a/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts+++ b/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts@@ -36,7 +36,7 @@ export class UnsubscribeTopicResolver {) {}@Query(() => [UnsubscribeTopicDTO])- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async unsubscribeTopics(@AuthWorkspace() currentWorkspace: WorkspaceEntity,): Promise<UnsubscribeTopicDTO[]> {@@ -48,7 +48,7 @@ export class UnsubscribeTopicResolver {}@Mutation(() => UnsubscribeTopicDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async createUnsubscribeTopic(@Args('input') input: CreateUnsubscribeTopicInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -62,7 +62,7 @@ export class UnsubscribeTopicResolver {}@Mutation(() => UnsubscribeTopicDTO)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async updateUnsubscribeTopic(@Args('input') input: UpdateUnsubscribeTopicInput,@AuthWorkspace() currentWorkspace: WorkspaceEntity,@@ -76,7 +76,7 @@ export class UnsubscribeTopicResolver {}@Mutation(() => Boolean)- @RequireFeatureFlag(FeatureFlagKey.IS_EMAIL_GROUP_ENABLED)+ @RequireFeatureFlag(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED)async deleteUnsubscribeTopic(@Args('id') id: string,@AuthWorkspace() currentWorkspace: WorkspaceEntity,diff --git a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.tsindex 45d26471475..f29117fd0d9 100644--- a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts@@ -43,7 +43,7 @@ describe('messageSuppressionResolver (integration)', () => {beforeAll(async () => {await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,value: true,expectToFail: false,});@@ -51,7 +51,7 @@ describe('messageSuppressionResolver (integration)', () => {afterAll(async () => {await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,value: false,expectToFail: false,});diff --git a/packages/twenty-server/test/integration/metadata/suites/emailing/unsubscribe-topic.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/emailing/unsubscribe-topic.integration-spec.tsindex d9aab57f7dd..f8e47b9ee20 100644--- a/packages/twenty-server/test/integration/metadata/suites/emailing/unsubscribe-topic.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/emailing/unsubscribe-topic.integration-spec.ts@@ -47,7 +47,7 @@ describe('unsubscribeTopicResolver (integration)', () => {beforeAll(async () => {await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,value: true,expectToFail: false,});@@ -55,7 +55,7 @@ describe('unsubscribeTopicResolver (integration)', () => {afterAll(async () => {await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_EMAIL_GROUP_ENABLED,+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,value: false,expectToFail: false,});diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex ba25811594e..d7077b930b8 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -3,7 +3,7 @@ export enum FeatureFlagKey {IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',- IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',+ IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',