Skip to content

The open alternative to Salesforce, designed for AI.

Remove the IS_MESSAGE_CAMPAIGN_ENABLED feature flag (#28929)

neo773aee9e7b384ef
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index dcd78ed9760..e254c314049 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -2290,7 +2290,6 @@ enum FeatureFlagKey {
IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED
IS_MCP_SERVERS_ENABLED
- IS_MESSAGE_CAMPAIGN_ENABLED
IS_RECORD_CREATION_FORM_ENABLED
IS_RECORD_LEVEL_SHARING_ENABLED
IS_REST_METADATA_API_NEW_FORMAT_DIRECT
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index deb78072d08..5c7fd9ebb96 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1512,7 +1512,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_MCP_SERVERS_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
+export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_MCP_SERVERS_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
export interface Field {
applicationId: Scalars['UUID']
@@ -12260,7 +12260,6 @@ export const enumFeatureFlagKey = {
IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED: 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED' as const,
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED: 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' as const,
IS_MCP_SERVERS_ENABLED: 'IS_MCP_SERVERS_ENABLED' as const,
- IS_MESSAGE_CAMPAIGN_ENABLED: 'IS_MESSAGE_CAMPAIGN_ENABLED' as const,
IS_RECORD_CREATION_FORM_ENABLED: 'IS_RECORD_CREATION_FORM_ENABLED' as const,
IS_RECORD_LEVEL_SHARING_ENABLED: 'IS_RECORD_LEVEL_SHARING_ENABLED' as const,
IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const
diff --git a/packages/twenty-front/src/generated-admin/schema.ts b/packages/twenty-front/src/generated-admin/schema.ts
index e5ff72d9068..cbce5a9c4ca 100644
--- a/packages/twenty-front/src/generated-admin/schema.ts
+++ b/packages/twenty-front/src/generated-admin/schema.ts
@@ -542,7 +542,6 @@ export enum FeatureFlagKey {
IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED = 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED',
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',
IS_MCP_SERVERS_ENABLED = 'IS_MCP_SERVERS_ENABLED',
- IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
diff --git a/packages/twenty-front/src/generated-metadata/schema.ts b/packages/twenty-front/src/generated-metadata/schema.ts
index 478136e3e06..3b71b18c55f 100644
--- a/packages/twenty-front/src/generated-metadata/schema.ts
+++ b/packages/twenty-front/src/generated-metadata/schema.ts
@@ -2422,7 +2422,6 @@ export enum FeatureFlagKey {
IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED = 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED',
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',
IS_MCP_SERVERS_ENABLED = 'IS_MCP_SERVERS_ENABLED',
- IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
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.ts
index c0bb75a15c9..4bcffeb1224 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
@@ -12,10 +12,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Record<
label: msg`Configurable search fields`,
description: msg`Choose which fields are used when searching for records.`,
},
- [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: {
- label: msg`Email campaigns`,
- description: msg`Enable email campaigns, lists, and unsubscribe management.`,
- },
[FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT]: {
label: msg`Direct REST metadata responses`,
description: msg`Return metadata directly instead of wrapping it in the legacy response envelope.`,
diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx
index be27a908701..ab76682cc04 100644
--- a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx
+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx
@@ -1,4 +1,3 @@
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { Status } from 'twenty-ui/primitives/data-display';
@@ -9,7 +8,6 @@ import { SettingsEmailingDomainAiSetup } from '@/settings/emailing-domains/compo
import { getVerificationRecordGroupContent } from '@/settings/emailing-domains/utils/getVerificationRecordGroupContent';
import { getVerificationRecordGroupKey } from '@/settings/emailing-domains/utils/getVerificationRecordGroupKey';
import { getVerificationRecordGroupStatusDisplay } from '@/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import {
type EmailingDomain,
EmailingDomainStatus,
@@ -26,29 +24,21 @@ type SettingsEmailingDomainDnsRecordsProps = {
export const SettingsEmailingDomainDnsRecords = ({
emailingDomain,
}: SettingsEmailingDomainDnsRecordsProps) => {
- const isMessageCampaignEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
-
- const groups = VERIFICATION_RECORD_GROUP_DISPLAY_ORDER.filter(
- (groupKey) => groupKey !== 'UNSUBSCRIBE' || isMessageCampaignEnabled,
- )
- .map((groupKey) => ({
- id: groupKey,
- records: (emailingDomain.verificationRecords ?? []).filter(
- (record) =>
- getVerificationRecordGroupKey({
- recordName: record.key,
- domain: emailingDomain.domain,
- }) === groupKey,
- ),
- status: getVerificationRecordGroupStatusDisplay({
- groupKey,
- emailingDomain,
- }),
- ...getVerificationRecordGroupContent(groupKey),
- }))
- .filter(({ records }) => records.length > 0);
+ const groups = VERIFICATION_RECORD_GROUP_DISPLAY_ORDER.map((groupKey) => ({
+ id: groupKey,
+ records: (emailingDomain.verificationRecords ?? []).filter(
+ (record) =>
+ getVerificationRecordGroupKey({
+ recordName: record.key,
+ domain: emailingDomain.domain,
+ }) === groupKey,
+ ),
+ status: getVerificationRecordGroupStatusDisplay({
+ groupKey,
+ emailingDomain,
+ }),
+ ...getVerificationRecordGroupContent(groupKey),
+ })).filter(({ records }) => records.length > 0);
if (groups.length === 0) {
return null;
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
index 059d4c93cbd..56dd58aba3d 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
@@ -9,8 +9,6 @@ import {
UnsubscribeHostnameStatus,
} from '~/generated-metadata/graphql';
import { getEmailingDomainStatusDisplay } from '@/settings/emailing-domains/utils/getEmailingDomainStatusDisplay';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { Status } from 'twenty-ui/primitives/data-display';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
@@ -24,9 +22,6 @@ export const SettingsWorkspaceEmailChannelDomainStatusCell = ({
}: SettingsWorkspaceEmailChannelDomainStatusCellProps) => {
const { t } = useLingui();
const { data } = useQuery(GetEmailingDomainsDocument);
- const isMessageCampaignEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
const channelDomain = getEmailChannelDomain(item.connectedAccount?.handle);
const emailingDomain = data?.getEmailingDomains?.find(
@@ -38,7 +33,6 @@ export const SettingsWorkspaceEmailChannelDomainStatusCell = ({
}
const isUnsubscribeHostnamePending =
- isMessageCampaignEnabled &&
emailingDomain.status === EmailingDomainStatus.VERIFIED &&
emailingDomain.unsubscribeHostnameStatus !==
UnsubscribeHostnameStatus.ACTIVE;
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
index 55078ebea47..5c9269bc1b2 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
@@ -9,8 +9,7 @@ import { SettingsWorkspaceEmailGroupSection } from '@/settings/workspace/compone
import { SettingsWorkspaceEmailSyncSection } from '@/settings/workspace/components/SettingsWorkspaceEmailSyncSection';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
+import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components/layout';
import {
@@ -42,10 +41,6 @@ export const SettingsWorkspaceCommunications = () => {
const navigateSettings = useNavigateSettings();
- const isMessageCampaignFeatureEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
-
const tabs = [
{ id: 'emails', title: t`Emails`, Icon: IconMail },
{
@@ -111,38 +106,34 @@ export const SettingsWorkspaceCommunications = () => {
/>
</StyledCardsColumn>
</Section.Root>
- {isMessageCampaignFeatureEnabled && (
- <Section.Root>
- <Section.Header
- title={t`Tracking`}
- description={t`Measure engagement on the campaigns this workspace sends`}
- />
- <Card.Root>
- <OpenTrackingSwitch divider />
- <ClickTrackingSwitch />
- </Card.Root>
- </Section.Root>
- )}
- {isMessageCampaignFeatureEnabled && (
- <Section.Root>
- <Section.Header
- title={t`Unsubscribe`}
- description={t`Manage unsubscribers, opt-out topics, and the page recipients see`}
+ <Section.Root>
+ <Section.Header
+ title={t`Tracking`}
+ description={t`Measure engagement on the campaigns this workspace sends`}
+ />
+ <Card.Root>
+ <OpenTrackingSwitch divider />
+ <ClickTrackingSwitch />
+ </Card.Root>
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
+ 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)}
/>
- <StyledCardsColumn>
- <SettingsCard
- Icon={
- <IconMailX
- size={theme.icon.size.lg}
- stroke={theme.icon.stroke.md}
- />
- }
- title={t`Manage unsubscribe`}
- onClick={() => navigateSettings(SettingsPath.Unsubscribe)}
- />
- </StyledCardsColumn>
- </Section.Root>
- )}
+ </StyledCardsColumn>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
index 6976a8edcbe..39a42bf86e3 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
@@ -5,10 +5,9 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { useCreateUnsubscribeTopic } from '@/settings/unsubscribe-topics/hooks/useCreateUnsubscribeTopic';
import { SETTINGS_UNSUBSCRIBE_TAB_IDS } from '@/settings/unsubscribers/constants/SettingsUnsubscribeTabIds';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { useCallback, useState } from 'react';
-import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
+import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import { Section } from 'twenty-ui/components/layout';
@@ -16,16 +15,12 @@ import { IconEye } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-import { NotFound } from '~/pages/not-found/NotFound';
export const SettingsWorkspaceNewUnsubscribeTopic = () => {
const { t } = useLingui();
const navigate = useNavigateSettings();
const { enqueueToast } = useToast();
const { createUnsubscribeTopic, loading } = useCreateUnsubscribeTopic();
- const isMessageCampaignEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
const [name, setName] = useState('');
const [description, setDescription] = useState('');
@@ -80,10 +75,6 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {
t,
]);
- if (!isMessageCampaignEnabled) {
- return <NotFound />;
- }
-
return (
<SettingsPageLayout
title={t`New Unsubscribe Topic`}
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx
index 01011826c0a..ec8ff69d813 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx
@@ -8,8 +8,7 @@ import { SettingsWorkspaceUnsubscribeTopicSection } from '@/settings/unsubscribe
import { SettingsUnsubscribePreview } from '@/settings/unsubscribers/components/SettingsUnsubscribePreview';
import { SettingsUnsubscribersList } from '@/settings/unsubscribers/components/SettingsUnsubscribersList';
import { SETTINGS_UNSUBSCRIBE_TAB_IDS } from '@/settings/unsubscribers/constants/SettingsUnsubscribeTabIds';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
+import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconEye, IconForbid, IconMailCog } from 'twenty-ui/icon';
@@ -18,10 +17,6 @@ const UNSUBSCRIBE_TABS_INSTANCE_ID = 'settings-unsubscribe-tabs';
export const SettingsWorkspaceUnsubscribe = () => {
const { t } = useLingui();
- const isMessageCampaignEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
-
const tabs = [
{
id: SETTINGS_UNSUBSCRIBE_TAB_IDS.UNSUBSCRIBERS,
@@ -45,10 +40,6 @@ export const SettingsWorkspaceUnsubscribe = () => {
tabs.map((tab) => tab.id),
);
- if (!isMessageCampaignEnabled) {
- return null;
- }
-
return (
<SettingsPageLayout
title={t`Unsubscribe`}
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
index ce147d934f3..0a91760cd86 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
@@ -9,11 +9,10 @@ import { SETTINGS_UNSUBSCRIBE_TAB_IDS } from '@/settings/unsubscribers/constants
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
-import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
+import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import { Section } from 'twenty-ui/components/layout';
@@ -36,9 +35,6 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
const { updateUnsubscribeTopic } = useUpdateUnsubscribeTopic();
const { deleteUnsubscribeTopic, loading: deleting } =
useDeleteUnsubscribeTopic();
- const isMessageCampaignEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- );
const unsubscribeTopic = unsubscribeTopics.find(
(topic) => topic.id === unsubscribeTopicId,
@@ -60,7 +56,7 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
return <SettingsSkeletonLoader />;
}
- if (!isMessageCampaignEnabled || !isDefined(unsubscribeTopic)) {
+ if (!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.ts
index a5cea7f396e..e795a8c41d7 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
@@ -1420,7 +1420,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] =
"isPinned": false,
"payload": null,
"hotKeys": null,
- "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED",
+ "conditionalAvailabilityExpression": null,
"availabilityType": "GLOBAL",
"availabilityObjectMetadataId": null,
"pageLayoutId": null,
@@ -1464,7 +1464,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] =
"isPinned": true,
"payload": null,
"hotKeys": null,
- "conditionalAvailabilityExpression": "pageType == \"INDEX_PAGE\" and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED",
+ "conditionalAvailabilityExpression": "pageType == \"INDEX_PAGE\"",
"availabilityType": "GLOBAL_OBJECT_CONTEXT",
"availabilityObjectMetadataId": "1c5db583-0b37-4eed-a568-208372ecb0f0",
"pageLayoutId": null,
@@ -1859,7 +1859,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] =
"isPinned": false,
"payload": null,
"hotKeys": null,
- "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign",
+ "conditionalAvailabilityExpression": "targetObjectReadPermissions.messageCampaign",
"availabilityType": "GLOBAL",
"availabilityObjectMetadataId": null,
"pageLayoutId": null,
@@ -1881,7 +1881,7 @@ export const mockedCommandMenuItems: CommandMenuItemFieldsFragment[] =
"isPinned": false,
"payload": null,
"hotKeys": null,
- "conditionalAvailabilityExpression": "featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageList",
+ "conditionalAvailabilityExpression": "targetObjectReadPermissions.messageList",
"availabilityType": "GLOBAL",
"availabilityObjectMetadataId": null,
"pageLayoutId": null,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
index 5c96b9792bc..e066ee82ee2 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts
@@ -3,6 +3,7 @@ import { Module } from '@nestjs/common';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { AddMergeWithRecordCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command';
import { UpdateCrmHygieneSkillMergeGuidanceCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793206127866-update-crm-hygiene-skill-merge-guidance.command';
+import { RemoveMessageCampaignFlagCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -17,6 +18,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
providers: [
AddMergeWithRecordCommandMenuItemCommand,
UpdateCrmHygieneSkillMergeGuidanceCommand,
+ RemoveMessageCampaignFlagCommand,
],
})
export class V2_54_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command.ts
new file mode 100644
index 00000000000..1f26fbfaaec
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command.ts
@@ -0,0 +1,96 @@
+import { Inject } from '@nestjs/common';
+import { Command } from 'nest-commander';
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+
+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 { buildMessageCampaignFlagRemovalUpdates } from 'src/database/commands/upgrade-version-command/2-54/utils/build-message-campaign-flag-removal-updates.util';
+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 { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+@RegisteredWorkspaceCommand('2.54.0', 1793266150123)
+@Command({
+ name: 'upgrade:2-54:remove-message-campaign-flag',
+ description:
+ 'Drop the message campaign feature flag from the campaign and list commands',
+})
+export class RemoveMessageCampaignFlagCommand extends ProvisionedWorkspaceCommandRunner {
+ @Inject(WorkspaceCacheService)
+ private readonly workspaceCacheService: WorkspaceCacheService;
+
+ @Inject(WorkspaceMigrationValidateBuildAndRunService)
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService;
+
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.up(args);
+ }
+
+ async up(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.apply({ ...args, direction: 'up' });
+ }
+
+ async down(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.apply({ ...args, direction: 'down' });
+ }
+
+ private async apply({
+ workspaceId,
+ options,
+ direction,
+ }: Pick<RunOnWorkspaceArgs, 'workspaceId' | 'options'> & {
+ direction: 'up' | 'down';
+ }): Promise<void> {
+ const { flatCommandMenuItemMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatCommandMenuItemMaps',
+ ]);
+ const commandMenuItemsToUpdate = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps,
+ direction,
+ now: new Date().toISOString(),
+ });
+
+ if (!isNonEmptyArray(commandMenuItemsToUpdate)) {
+ return;
+ }
+
+ this.logger.log(
+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: updating ${commandMenuItemsToUpdate.length} campaign command(s)`,
+ );
+
+ if (options.dryRun) {
+ return;
+ }
+
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ workspaceId,
+ isSystemBuild: true,
+ applicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+ allFlatEntityOperationByMetadataName: {
+ commandMenuItem: {
+ flatEntityToCreate: [],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: commandMenuItemsToUpdate,
+ },
+ },
+ },
+ );
+
+ if (result.status === 'fail') {
+ throw new WorkspaceMigrationBuilderException(result);
+ }
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/__tests__/build-message-campaign-flag-removal-updates.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/__tests__/build-message-campaign-flag-removal-updates.util.spec.ts
new file mode 100644
index 00000000000..1c668f21dc8
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/__tests__/build-message-campaign-flag-removal-updates.util.spec.ts
@@ -0,0 +1,334 @@
+import {
+ getSystemNavigationCommandMenuItemUniversalIdentifier,
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+} from 'twenty-shared/application';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
+
+import { buildMessageCampaignFlagRemovalUpdates } from 'src/database/commands/upgrade-version-command/2-54/utils/build-message-campaign-flag-removal-updates.util';
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
+
+const NOW = '2026-10-26T12:00:00.000Z';
+const FLAG = 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED';
+
+const buildCommandMenuItem = ({
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ applicationUniversalIdentifier = TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+}: {
+ universalIdentifier: string;
+ conditionalAvailabilityExpression: string | null;
+ applicationUniversalIdentifier?: string;
+}): FlatCommandMenuItem => ({
+ workspaceId: '20202020-1111-4111-8111-111111111111',
+ applicationId: '20202020-2222-4222-8222-222222222222',
+ applicationUniversalIdentifier,
+ createdAt: NOW,
+ updatedAt: NOW,
+ id: universalIdentifier,
+ universalIdentifier,
+ label: 'Campaign',
+ shortLabel: 'Campaign',
+ icon: 'IconSend',
+ position: 66,
+ isPinned: false,
+ isActive: true,
+ isSystemSideEffect: false,
+ engineComponentKey: EngineComponentKey.COMPOSE_CAMPAIGN,
+ availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
+ conditionalAvailabilityExpression,
+ conditionalPinnedExpression: null,
+ availabilityObjectMetadataId: null,
+ availabilityObjectMetadataUniversalIdentifier: null,
+ navigationTargetObjectMetadataId: null,
+ navigationTargetObjectMetadataUniversalIdentifier: null,
+ frontComponentId: null,
+ frontComponentUniversalIdentifier: null,
+ pageLayoutId: null,
+ pageLayoutUniversalIdentifier: null,
+ workflowVersionId: null,
+ coreWorkflowVersionId: null,
+ hotKeys: null,
+ payload: null,
+ overrides: null,
+ universalOverrides: null,
+});
+
+const buildMaps = (
+ commandMenuItems: FlatCommandMenuItem[],
+): FlatEntityMaps<FlatCommandMenuItem> => ({
+ ...createEmptyFlatEntityMaps(),
+ byUniversalIdentifier: Object.fromEntries(
+ commandMenuItems.map((commandMenuItem) => [
+ commandMenuItem.universalIdentifier,
+ commandMenuItem,
+ ]),
+ ),
+});
+
+const FLAGGED_SEND_CAMPAIGN_EXPRESSION = `numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and ${FLAG}`;
+const FLAGGED_ADD_TO_LIST_EXPRESSION = `${FLAG} and targetObjectWritePermissions.messageListMember and numberOfSelectedRecords >= 1 and not hasAnySoftDeleteFilterOnView and (isSelectAll or noneDefined(selectedRecords, "deletedAt"))`;
+
+describe('buildMessageCampaignFlagRemovalUpdates', () => {
+ it('drops the flag and lands on the shipped standard expressions', () => {
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps([
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.composeCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: FLAG,
+ }),
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: FLAGGED_SEND_CAMPAIGN_EXPRESSION,
+ }),
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.addToMessageList.universalIdentifier,
+ conditionalAvailabilityExpression: FLAGGED_ADD_TO_LIST_EXPRESSION,
+ }),
+ ]),
+ direction: 'up',
+ now: NOW,
+ });
+
+ expect(
+ updates.map(
+ ({ universalIdentifier, conditionalAvailabilityExpression }) => ({
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ }),
+ ),
+ ).toEqual(
+ [
+ STANDARD_COMMAND_MENU_ITEMS.composeCampaign,
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign,
+ STANDARD_COMMAND_MENU_ITEMS.addToMessageList,
+ ].map(({ universalIdentifier, conditionalAvailabilityExpression }) => ({
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ })),
+ );
+ });
+
+ it('turns every flagged campaign item into its shipped expression and is a no-op on a second run', () => {
+ const flaggedExpressionByUniversalIdentifier: [
+ string,
+ string,
+ string | null,
+ ][] = [
+ [
+ STANDARD_COMMAND_MENU_ITEMS.composeCampaignPinned.universalIdentifier,
+ `pageType == "INDEX_PAGE" and ${FLAG}`,
+ STANDARD_COMMAND_MENU_ITEMS.composeCampaignPinned
+ .conditionalAvailabilityExpression,
+ ],
+ [
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaignTest.universalIdentifier,
+ FLAGGED_SEND_CAMPAIGN_EXPRESSION,
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaignTest
+ .conditionalAvailabilityExpression,
+ ],
+ [
+ STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign.universalIdentifier,
+ `numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "SCHEDULED") or everyEquals(selectedRecords, "status", "SENDING")) and noneDefined(selectedRecords, "deletedAt") and ${FLAG}`,
+ STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign
+ .conditionalAvailabilityExpression,
+ ],
+ [
+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageCampaign
+ .universalIdentifier,
+ `numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords and ${FLAG}`,
+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageCampaign
+ .conditionalAvailabilityExpression,
+ ],
+ [
+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageList.universalIdentifier,
+ `${FLAG} and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords`,
+ STANDARD_COMMAND_MENU_ITEMS.duplicateMessageList
+ .conditionalAvailabilityExpression,
+ ],
+ [
+ STANDARD_COMMAND_MENU_ITEMS.addViewToMessageList.universalIdentifier,
+ `${FLAG} and targetObjectWritePermissions.messageListMember and pageType == "INDEX_PAGE" and not hasAnySoftDeleteFilterOnView`,
+ STANDARD_COMMAND_MENU_ITEMS.addViewToMessageList
+ .conditionalAvailabilityExpression,
+ ],
+ ...(
+ [
+ [
+ STANDARD_OBJECTS.messageCampaign.universalIdentifier,
+ 'messageCampaign',
+ ],
+ [STANDARD_OBJECTS.messageList.universalIdentifier, 'messageList'],
+ ] as const
+ ).map(
+ ([objectUniversalIdentifier, nameSingular]): [
+ string,
+ string,
+ string,
+ ] => [
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier,
+ }),
+ `${FLAG} and targetObjectReadPermissions.${nameSingular}`,
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier: objectUniversalIdentifier,
+ nameSingular,
+ }),
+ ],
+ ),
+ ];
+
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps(
+ flaggedExpressionByUniversalIdentifier.map(
+ ([universalIdentifier, conditionalAvailabilityExpression]) =>
+ buildCommandMenuItem({
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ }),
+ ),
+ ),
+ direction: 'up',
+ now: NOW,
+ });
+
+ expect(
+ updates.map(
+ ({ universalIdentifier, conditionalAvailabilityExpression }) => [
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ ],
+ ),
+ ).toEqual(
+ expect.arrayContaining(
+ flaggedExpressionByUniversalIdentifier.map(
+ ([universalIdentifier, , expectedExpression]) => [
+ universalIdentifier,
+ expectedExpression,
+ ],
+ ),
+ ),
+ );
+ expect(updates).toHaveLength(flaggedExpressionByUniversalIdentifier.length);
+
+ expect(
+ buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps(updates),
+ direction: 'up',
+ now: NOW,
+ }),
+ ).toEqual([]);
+ });
+
+ it('strips the flag from older stored variants without touching the rest of the expression', () => {
+ const olderDraftOnlyExpression =
+ 'numberOfSelectedRecords == 1 and everyEquals(selectedRecords, "status", "DRAFT") and noneDefined(selectedRecords, "deletedAt")';
+
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps([
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: `${olderDraftOnlyExpression} and ${FLAG}`,
+ }),
+ ]),
+ direction: 'up',
+ now: NOW,
+ });
+
+ expect(updates[0]?.conditionalAvailabilityExpression).toBe(
+ olderDraftOnlyExpression,
+ );
+ });
+
+ it('leaves an expression alone when the flag is not a leading or trailing condition', () => {
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps([
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: `not ${FLAG} and numberOfSelectedRecords == 1`,
+ }),
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign
+ .universalIdentifier,
+ conditionalAvailabilityExpression: `numberOfSelectedRecords == 1 or ${FLAG}`,
+ }),
+ ]),
+ direction: 'up',
+ now: NOW,
+ });
+
+ expect(updates).toEqual([]);
+ });
+
+ it('leaves items without the flag and items owned by another application untouched', () => {
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps([
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.composeCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: null,
+ }),
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: FLAGGED_SEND_CAMPAIGN_EXPRESSION,
+ applicationUniversalIdentifier:
+ '20202020-3333-4333-8333-333333333333',
+ }),
+ ]),
+ direction: 'up',
+ now: NOW,
+ });
+
+ expect(updates).toEqual([]);
+ });
+
+ it('puts the flag back on down only for items still on the shipped expression', () => {
+ const updates = buildMessageCampaignFlagRemovalUpdates({
+ flatCommandMenuItemMaps: buildMaps([
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.addToMessageList.universalIdentifier,
+ conditionalAvailabilityExpression:
+ STANDARD_COMMAND_MENU_ITEMS.addToMessageList
+ .conditionalAvailabilityExpression,
+ }),
+ buildCommandMenuItem({
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier,
+ conditionalAvailabilityExpression: 'numberOfSelectedRecords == 1',
+ }),
+ ]),
+ direction: 'down',
+ now: NOW,
+ });
+
+ expect(
+ updates.map(
+ ({ universalIdentifier, conditionalAvailabilityExpression }) => ({
+ universalIdentifier,
+ conditionalAvailabilityExpression,
+ }),
+ ),
+ ).toEqual([
+ {
+ universalIdentifier:
+ STANDARD_COMMAND_MENU_ITEMS.addToMessageList.universalIdentifier,
+ conditionalAvailabilityExpression: FLAGGED_ADD_TO_LIST_EXPRESSION,
+ },
+ ]);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/build-message-campaign-flag-removal-updates.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/build-message-campaign-flag-removal-updates.util.ts
new file mode 100644
index 00000000000..739993eb7aa
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/utils/build-message-campaign-flag-removal-updates.util.ts
@@ -0,0 +1,144 @@
+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 { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
+
+const MESSAGE_CAMPAIGN_FLAG = 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED';
+
+const getNavigationUniversalIdentifier = (objectUniversalIdentifier: string) =>
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier,
+ });
+
+const FLAGGED_EXPRESSION_BY_UNIVERSAL_IDENTIFIER: Record<string, string> = {
+ [STANDARD_COMMAND_MENU_ITEMS.composeCampaign.universalIdentifier]:
+ MESSAGE_CAMPAIGN_FLAG,
+ [STANDARD_COMMAND_MENU_ITEMS.composeCampaignPinned.universalIdentifier]:
+ `pageType == "INDEX_PAGE" and ${MESSAGE_CAMPAIGN_FLAG}`,
+ [STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaign.universalIdentifier]:
+ `numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and ${MESSAGE_CAMPAIGN_FLAG}`,
+ [STANDARD_COMMAND_MENU_ITEMS.sendMessageCampaignTest.universalIdentifier]:
+ `numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt") and ${MESSAGE_CAMPAIGN_FLAG}`,
+ [STANDARD_COMMAND_MENU_ITEMS.cancelMessageCampaign.universalIdentifier]:
+ `numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "SCHEDULED") or everyEquals(selectedRecords, "status", "SENDING")) and noneDefined(selectedRecords, "deletedAt") and ${MESSAGE_CAMPAIGN_FLAG}`,
+ [STANDARD_COMMAND_MENU_ITEMS.duplicateMessageCampaign.universalIdentifier]:
+ `numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords and ${MESSAGE_CAMPAIGN_FLAG}`,
+ [STANDARD_COMMAND_MENU_ITEMS.duplicateMessageList.universalIdentifier]:
+ `${MESSAGE_CAMPAIGN_FLAG} and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords`,
+ [STANDARD_COMMAND_MENU_ITEMS.addToMessageList.universalIdentifier]:
+ `${MESSAGE_CAMPAIGN_FLAG} and targetObjectWritePermissions.messageListMember and numberOfSelectedRecords >= 1 and not hasAnySoftDeleteFilterOnView and (isSelectAll or noneDefined(selectedRecords, "deletedAt"))`,
+ [STANDARD_COMMAND_MENU_ITEMS.addViewToMessageList.universalIdentifier]:
+ `${MESSAGE_CAMPAIGN_FLAG} and targetObjectWritePermissions.messageListMember and pageType == "INDEX_PAGE" and not hasAnySoftDeleteFilterOnView`,
+ [getNavigationUniversalIdentifier(
+ STANDARD_OBJECTS.messageCampaign.universalIdentifier,
+ )]:
+ `${MESSAGE_CAMPAIGN_FLAG} and targetObjectReadPermissions.messageCampaign`,
+ [getNavigationUniversalIdentifier(
+ STANDARD_OBJECTS.messageList.universalIdentifier,
+ )]: `${MESSAGE_CAMPAIGN_FLAG} and targetObjectReadPermissions.messageList`,
+};
+
+const LEADING_MESSAGE_CAMPAIGN_FLAG = `${MESSAGE_CAMPAIGN_FLAG} and `;
+
+const TRAILING_MESSAGE_CAMPAIGN_FLAG = ` and ${MESSAGE_CAMPAIGN_FLAG}`;
+
+const getExpressionWithoutFlagOrUndefined = (
+ expression: string,
+): string | null | undefined => {
+ if (expression === MESSAGE_CAMPAIGN_FLAG) {
+ return null;
+ }
+
+ let remainingExpression: string | undefined;
+
+ if (expression.startsWith(LEADING_MESSAGE_CAMPAIGN_FLAG)) {
+ remainingExpression = expression.slice(
+ LEADING_MESSAGE_CAMPAIGN_FLAG.length,
+ );
+ } else if (expression.endsWith(TRAILING_MESSAGE_CAMPAIGN_FLAG)) {
+ remainingExpression = expression.slice(
+ 0,
+ -TRAILING_MESSAGE_CAMPAIGN_FLAG.length,
+ );
+ }
+
+ if (
+ !isDefined(remainingExpression) ||
+ remainingExpression.includes(MESSAGE_CAMPAIGN_FLAG)
+ ) {
+ return undefined;
+ }
+
+ return remainingExpression;
+};
+
+export const buildMessageCampaignFlagRemovalUpdates = ({
+ flatCommandMenuItemMaps,
+ direction,
+ now,
+}: {
+ flatCommandMenuItemMaps: FlatEntityMaps<FlatCommandMenuItem>;
+ direction: 'up' | 'down';
+ now: string;
+}): FlatCommandMenuItem[] =>
+ Object.entries(FLAGGED_EXPRESSION_BY_UNIVERSAL_IDENTIFIER).flatMap(
+ ([universalIdentifier, flaggedExpression]) => {
+ const commandMenuItem =
+ flatCommandMenuItemMaps.byUniversalIdentifier[universalIdentifier];
+
+ if (
+ !isDefined(commandMenuItem) ||
+ commandMenuItem.applicationUniversalIdentifier !==
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER
+ ) {
+ return [];
+ }
+
+ const currentExpression =
+ commandMenuItem.conditionalAvailabilityExpression;
+
+ if (direction === 'up') {
+ if (!isDefined(currentExpression)) {
+ return [];
+ }
+
+ const expressionWithoutFlag =
+ getExpressionWithoutFlagOrUndefined(currentExpression);
+
+ if (expressionWithoutFlag === undefined) {
+ return [];
+ }
+
+ return [
+ {
+ ...commandMenuItem,
+ conditionalAvailabilityExpression: expressionWithoutFlag,
+ updatedAt: now,
+ },
+ ];
+ }
+
+ if (
+ currentExpression !==
+ getExpressionWithoutFlagOrUndefined(flaggedExpression)
+ ) {
+ return [];
+ }
+
+ return [
+ {
+ ...commandMenuItem,
+ conditionalAvailabilityExpression: flaggedExpression,
+ updatedAt: now,
+ },
+ ];
+ },
+ );
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.ts
index c5ff9e1f3e7..7a42adbda06 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
@@ -1,5 +1,4 @@
import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
@@ -140,22 +139,6 @@ describe('buildObjectNavigationFlatCommandMenuItem', () => {
);
});
- it('should additionally gate conditionalAvailabilityExpression behind the feature flag for feature-flagged objects', () => {
- const result = buildObjectNavigationFlatCommandMenuItem({
- ...baseArgs,
- objectMetadata: {
- ...baseObjectMetadata,
- universalIdentifier:
- STANDARD_OBJECTS.messageCampaign.universalIdentifier,
- nameSingular: 'messageCampaign',
- },
- });
-
- expect(result.conditionalAvailabilityExpression).toBe(
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign',
- );
- });
-
it('should set isPinned to false', () => {
const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
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.ts
index 086beda5879..4ab774a413e 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
@@ -3,33 +3,13 @@ import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
describe('buildNavigationConditionalAvailabilityExpression', () => {
- it('gates a feature-flagged standard object behind both the flag and read permission', () => {
+ it('gates navigation behind read permission on the target object', () => {
expect(
buildNavigationConditionalAvailabilityExpression({
universalIdentifier:
STANDARD_OBJECTS.messageCampaign.universalIdentifier,
nameSingular: 'messageCampaign',
}),
- ).toBe(
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectReadPermissions.messageCampaign',
- );
- });
-
- it('returns only the read-permission expression for non-gated objects', () => {
- expect(
- buildNavigationConditionalAvailabilityExpression({
- universalIdentifier: 'obj-universal-1',
- nameSingular: 'person',
- }),
- ).toBe('targetObjectReadPermissions.person');
- });
-
- it('does not gate a custom object that reuses a feature-flagged object name', () => {
- expect(
- buildNavigationConditionalAvailabilityExpression({
- universalIdentifier: 'custom-object-universal-id',
- nameSingular: 'messageCampaign',
- }),
).toBe('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.ts
index c477178612c..343653fb84d 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
@@ -2,10 +2,7 @@ import { msg } from '@lingui/core/macro';
import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
import { getMetadataLabelPlaceholder } from 'twenty-shared/i18n';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import {
- CommandMenuItemAvailabilityType,
- FeatureFlagKey,
-} from 'twenty-shared/types';
+import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
@@ -25,15 +22,6 @@ export const NAVIGATION_INTERPOLATED_SHORT_LABEL =
export const NAVIGATION_INTERPOLATED_ICON =
getMetadataLabelPlaceholder('objectIcon');
-const NAVIGATION_FEATURE_FLAG_GATE_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<
- Record<string, FeatureFlagKey>
-> = {
- [STANDARD_OBJECTS.messageCampaign.universalIdentifier]:
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- [STANDARD_OBJECTS.messageList.universalIdentifier]:
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
-};
-
const HIDDEN_NAVIGATION_OBJECT_UNIVERSAL_IDENTIFIERS = new Set<string>([
STANDARD_OBJECTS.workflowVersion.universalIdentifier,
]);
@@ -49,15 +37,7 @@ export const buildNavigationConditionalAvailabilityExpression = ({
return 'false';
}
- const targetObjectReadPermissionExpression = `targetObjectReadPermissions.${nameSingular}`;
- const featureFlagGate =
- NAVIGATION_FEATURE_FLAG_GATE_BY_OBJECT_UNIVERSAL_IDENTIFIER[
- universalIdentifier
- ];
-
- return isDefined(featureFlagGate)
- ? `featureFlags.${featureFlagGate} and ${targetObjectReadPermissionExpression}`
- : targetObjectReadPermissionExpression;
+ return `targetObjectReadPermissions.${nameSingular}`;
};
export const buildObjectNavigationUniversalFlatCommandMenuItem = ({
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.ts
index 50e372c78f4..bc53e6f19fb 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
@@ -4,7 +4,6 @@ import { type QueryRunner } from 'typeorm';
const tableName = 'featureFlag';
const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {
- [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: true,
[FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED]: true,
[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: false,
[FeatureFlagKey.IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED]: true,
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.ts
index e9fe71ed6c7..25b85a10cb0 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
@@ -1195,8 +1195,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
msg({ message: `Campaign`, context: 'commandMenuItem.shortLabel' }),
),
availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
- conditionalAvailabilityExpression:
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',
+ conditionalAvailabilityExpression: null,
availabilityObjectMetadataUniversalIdentifier: null,
frontComponentUniversalIdentifier: null,
engineComponentKey: EngineComponentKey.COMPOSE_CAMPAIGN,
@@ -1214,8 +1213,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
msg({ message: `Create`, context: 'commandMenuItem.shortLabel' }),
),
availabilityType: CommandMenuItemAvailabilityType.GLOBAL_OBJECT_CONTEXT,
- conditionalAvailabilityExpression:
- 'pageType == "INDEX_PAGE" and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',
+ conditionalAvailabilityExpression: 'pageType == "INDEX_PAGE"',
conditionalPinnedExpression: 'numberOfSelectedRecords == 0',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.messageCampaign.universalIdentifier,
@@ -1236,7 +1234,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_MESSAGE_CAMPAIGN_ENABLED',
+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt")',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.messageCampaign.universalIdentifier,
frontComponentUniversalIdentifier: null,
@@ -1256,7 +1254,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_MESSAGE_CAMPAIGN_ENABLED',
+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "DRAFT") or everyEquals(selectedRecords, "status", "SCHEDULED")) and noneDefined(selectedRecords, "deletedAt")',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.messageCampaign.universalIdentifier,
frontComponentUniversalIdentifier: null,
@@ -1276,7 +1274,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_MESSAGE_CAMPAIGN_ENABLED',
+ 'numberOfSelectedRecords == 1 and (everyEquals(selectedRecords, "status", "SCHEDULED") or everyEquals(selectedRecords, "status", "SENDING")) and noneDefined(selectedRecords, "deletedAt")',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.messageCampaign.universalIdentifier,
frontComponentUniversalIdentifier: null,
@@ -1296,7 +1294,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
),
availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
conditionalAvailabilityExpression:
- 'numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords and featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED',
+ 'numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords',
// Pinned only on sent campaigns, the ones people re-run; drafts keep it in the menu
conditionalPinnedExpression:
'everyEquals(selectedRecords, "status", "SENT")',
@@ -1785,7 +1783,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
),
availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
conditionalAvailabilityExpression:
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords',
+ 'numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and objectPermissions.canUpdateObjectRecords',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.messageList.universalIdentifier,
frontComponentUniversalIdentifier: null,
@@ -1805,7 +1803,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
),
availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
conditionalAvailabilityExpression:
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectWritePermissions.messageListMember and numberOfSelectedRecords >= 1 and not hasAnySoftDeleteFilterOnView and (isSelectAll or noneDefined(selectedRecords, "deletedAt"))',
+ 'targetObjectWritePermissions.messageListMember and numberOfSelectedRecords >= 1 and not hasAnySoftDeleteFilterOnView and (isSelectAll or noneDefined(selectedRecords, "deletedAt"))',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.person.universalIdentifier,
frontComponentUniversalIdentifier: null,
@@ -1825,7 +1823,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
),
availabilityType: CommandMenuItemAvailabilityType.GLOBAL_OBJECT_CONTEXT,
conditionalAvailabilityExpression:
- 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED and targetObjectWritePermissions.messageListMember and pageType == "INDEX_PAGE" and not hasAnySoftDeleteFilterOnView',
+ 'targetObjectWritePermissions.messageListMember and pageType == "INDEX_PAGE" and not hasAnySoftDeleteFilterOnView',
availabilityObjectMetadataUniversalIdentifier:
STANDARD_OBJECTS.person.universalIdentifier,
frontComponentUniversalIdentifier: null,
diff --git a/packages/twenty-server/src/modules/emailing/emailing.module.ts b/packages/twenty-server/src/modules/emailing/emailing.module.ts
index c868f05017a..1d06aa585e3 100644
--- a/packages/twenty-server/src/modules/emailing/emailing.module.ts
+++ b/packages/twenty-server/src/modules/emailing/emailing.module.ts
@@ -15,7 +15,6 @@ import { ShortLinkModule } from 'src/engine/core-modules/short-link/short-link.m
import { ClickHouseModule } from 'src/database/clickhouse/clickhouse.module';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { UnsubscribeTopicEntity } from 'src/engine/core-modules/emailing-domain/unsubscribe-topic.entity';
-import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { FileUrlModule } from 'src/engine/core-modules/file/file-url/file-url.module';
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -79,7 +78,6 @@ import { SendCampaignTool } from 'src/modules/emailing/tools/send-campaign.tool'
EmailingDomainModule,
ThrottlerModule,
MessageChannelMetadataModule,
- FeatureFlagModule,
FileUrlModule,
PermissionsModule,
UserRoleModule,
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.ts
index 15b55e0b84b..f925daa27c9 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
@@ -2,7 +2,6 @@ import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
import { Args, Context, 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 { CampaignAudiencePreviewDTO } from 'src/engine/core-modules/emailing-domain/dtos/campaign-audience-preview.dto';
@@ -24,7 +23,6 @@ import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usa
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ThrottlerGraphqlApiExceptionFilter } from 'src/engine/core-modules/throttler/filters/throttler-graphql-api-exception.filter';
@@ -67,7 +65,6 @@ export class EmailingSendResolver {
) {}
@Mutation(() => SendMessageCampaignOutputDTO)
- @UseGuards(FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED))
async sendMessageCampaign(
@Args('input') input: SendMessageCampaignInput,
@AuthWorkspace() currentWorkspace: WorkspaceEntity,
@@ -84,7 +81,6 @@ export class EmailingSendResolver {
}
@Mutation(() => CancelMessageCampaignOutputDTO)
- @UseGuards(FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED))
async cancelMessageCampaign(
@Args('input') input: CancelMessageCampaignInput,
@AuthWorkspace() currentWorkspace: WorkspaceEntity,
@@ -100,7 +96,6 @@ export class EmailingSendResolver {
}
@Mutation(() => SendEmailViaDomainOutputDTO)
- @UseGuards(FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED))
async sendMessageCampaignTest(
@Args('input') input: SendMessageCampaignTestInput,
@AuthWorkspace() currentWorkspace: WorkspaceEntity,
@@ -123,7 +118,6 @@ export class EmailingSendResolver {
}
@Query(() => CampaignAudiencePreviewDTO)
- @UseGuards(FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED))
async previewMessageCampaignAudience(
@Args('input') input: PreviewMessageCampaignAudienceInput,
@AuthWorkspace() currentWorkspace: WorkspaceEntity,
@@ -152,7 +146,6 @@ export class EmailingSendResolver {
oauthClient: false,
application: false,
}),
- FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED),
)
async previewMessageCampaignSend(
@Args('input') input: PreviewMessageCampaignSendInput,
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.ts
index e0858b29828..b74bf1f91b5 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
@@ -1,8 +1,6 @@
import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
import { Args, Mutation } from '@nestjs/graphql';
-import { FeatureFlagKey } from 'twenty-shared/types';
-
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
@@ -10,7 +8,6 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { DuplicatedMessageListDTO } from 'src/modules/emailing/dtos/duplicated-message-list.dto';
@@ -39,7 +36,6 @@ import { MessageListGraphqlApiExceptionFilter } from 'src/modules/emailing/utils
oauthClient: true,
application: true,
}),
- FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED),
)
@UsePipes(ResolverValidationPipe)
export class MessageListResolver {
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.ts
index 10f8363dc0d..52b43e28cc8 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
@@ -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 { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -18,7 +17,6 @@ import { EmailGroupAccessService } from 'src/engine/core-modules/emailing-domain
import { 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 } from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';
@@ -36,7 +34,6 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
oauthClient: true,
application: true,
}),
- FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
@UseFilters(
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.ts
index 672b916ded0..414e834bdcb 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
@@ -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 { CreateUnsubscribeTopicInput } from 'src/engine/core-modules/emailing-domain/dtos/create-unsubscribe-topic.input';
@@ -13,7 +12,6 @@ import { EmailGroupAccessService } from 'src/engine/core-modules/emailing-domain
import { 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 } from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { UnsubscribeTopicService } from 'src/modules/emailing/services/unsubscribe-topic.service';
@@ -31,7 +29,6 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
oauthClient: true,
application: true,
}),
- FeatureFlagGuard(FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
@UseFilters(
diff --git a/packages/twenty-server/src/modules/emailing/tools/find-campaign-suppressions.tool.ts b/packages/twenty-server/src/modules/emailing/tools/find-campaign-suppressions.tool.ts
index bd27fef9133..8c7dd7ea8e4 100644
--- a/packages/twenty-server/src/modules/emailing/tools/find-campaign-suppressions.tool.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/find-campaign-suppressions.tool.ts
@@ -1,6 +1,5 @@
import { ToolCategory } from 'twenty-shared/ai';
import { PermissionFlagType } from 'twenty-shared/constants';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { z } from 'zod';
import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
@@ -34,7 +33,6 @@ const findCampaignSuppressionsInputSchema = z.object({
name: 'find_campaign_suppressions',
category: ToolCategory.ACTION,
requiredPermissionFlags: [PermissionFlagType.WORKSPACE],
- requiredFeatureFlags: [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED],
description:
'List the email addresses that campaigns skip: bounces, spam complaints, unsubscribes (global or per topic) and tracking opt-outs, newest first. ' +
'Use it to explain why someone is not receiving campaigns. Read only: suppressions can only be removed from the settings page.',
diff --git a/packages/twenty-server/src/modules/emailing/tools/preview-campaign-send.tool.ts b/packages/twenty-server/src/modules/emailing/tools/preview-campaign-send.tool.ts
index 7f726a258e8..f047790a694 100644
--- a/packages/twenty-server/src/modules/emailing/tools/preview-campaign-send.tool.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/preview-campaign-send.tool.ts
@@ -1,6 +1,5 @@
import { ToolCategory } from 'twenty-shared/ai';
import { PermissionFlagType } from 'twenty-shared/constants';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { z } from 'zod';
@@ -26,7 +25,6 @@ const previewCampaignSendInputSchema = z.object({
name: 'preview_campaign_send',
category: ToolCategory.ACTION,
requiredPermissionFlags: [PermissionFlagType.WORKSPACE],
- requiredFeatureFlags: [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED],
description:
'Check whether an email campaign can be sent, without sending anything. ' +
'Returns the audience: list members, how many are sendable, and how many are skipped and why (no email, duplicate email, suppressed, globally or topic unsubscribed, tracking refused). ' +
diff --git a/packages/twenty-server/src/modules/emailing/tools/send-campaign-test.tool.ts b/packages/twenty-server/src/modules/emailing/tools/send-campaign-test.tool.ts
index 7698fa2189c..5d5f0247eb3 100644
--- a/packages/twenty-server/src/modules/emailing/tools/send-campaign-test.tool.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/send-campaign-test.tool.ts
@@ -1,6 +1,5 @@
import { ToolCategory } from 'twenty-shared/ai';
import { PermissionFlagType } from 'twenty-shared/constants';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { z } from 'zod';
@@ -23,7 +22,6 @@ const sendCampaignTestInputSchema = z.object({
name: SEND_CAMPAIGN_TEST_TOOL_NAME,
category: ToolCategory.ACTION,
requiredPermissionFlags: [PermissionFlagType.WORKSPACE],
- requiredFeatureFlags: [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED],
description:
'Send one test email of a saved campaign to a single address, from the campaign sender. ' +
'Variables render with empty values or their fallbacks, since the test is not tied to a person. ' +
diff --git a/packages/twenty-server/src/modules/emailing/tools/send-campaign.tool.ts b/packages/twenty-server/src/modules/emailing/tools/send-campaign.tool.ts
index 1871fde9dd7..efc461d2328 100644
--- a/packages/twenty-server/src/modules/emailing/tools/send-campaign.tool.ts
+++ b/packages/twenty-server/src/modules/emailing/tools/send-campaign.tool.ts
@@ -1,6 +1,6 @@
import { ToolCategory } from 'twenty-shared/ai';
import { PermissionFlagType } from 'twenty-shared/constants';
-import { FeatureFlagKey, MessageCampaignStatus } from 'twenty-shared/types';
+import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { z } from 'zod';
@@ -34,7 +34,6 @@ const sendCampaignInputSchema = z.object({
name: SEND_CAMPAIGN_TOOL_NAME,
category: ToolCategory.ACTION,
requiredPermissionFlags: [PermissionFlagType.WORKSPACE],
- requiredFeatureFlags: [FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED],
description:
'Send an email campaign to its list now, or schedule it. This emails real people and cannot be undone once sending starts. ' +
'Only call it after the person explicitly asked to send this campaign and approved the recipient count from preview_campaign_send. ' +
diff --git a/packages/twenty-server/test/integration/emailing/add-people-to-message-list.integration-spec.ts b/packages/twenty-server/test/integration/emailing/add-people-to-message-list.integration-spec.ts
index 312d5f0c322..ddd7b4c4d36 100644
--- a/packages/twenty-server/test/integration/emailing/add-people-to-message-list.integration-spec.ts
+++ b/packages/twenty-server/test/integration/emailing/add-people-to-message-list.integration-spec.ts
@@ -3,17 +3,14 @@ import { createManyOperation } from 'test/integration/graphql/utils/create-many-
import { destroyManyOperationFactory } from 'test/integration/graphql/utils/destroy-many-operation-factory.util';
import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { expectEventually } from 'test/integration/utils/expect-eventually.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { FeatureFlagKey, FieldActorSource } from 'twenty-shared/types';
+import { FieldActorSource } from 'twenty-shared/types';
import { v4 } from 'uuid';
-import { type FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { type MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
-import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { type AddPeopleToMessageListService } from 'src/modules/emailing/services/add-people-to-message-list.service';
const people = Array.from({ length: 1005 }, (_, index) => ({
@@ -152,23 +149,7 @@ const destroyInBatches = async ({
};
describe('triggerAddPeopleToMessageListJob (integration)', () => {
- let wasMessageCampaignEnabled: boolean;
-
beforeAll(async () => {
- wasMessageCampaignEnabled =
- await getAppProviderByClassName<FeatureFlagService>(
- 'FeatureFlagService',
- ).isFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- SEED_APPLE_WORKSPACE_ID,
- );
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
-
for (let offset = 0; offset < people.length; offset += 100) {
const result = await createManyOperation({
objectMetadataSingularName: 'person',
@@ -203,11 +184,6 @@ describe('triggerAddPeopleToMessageListJob (integration)', () => {
field: 'id',
values: personIds,
});
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: wasMessageCampaignEnabled,
- expectToFail: false,
- });
}, 60_000);
it('adds every person matching the filter across pages, then skips people already on the list', async () => {
diff --git a/packages/twenty-server/test/integration/emailing/campaign-mcp-tools.integration-spec.ts b/packages/twenty-server/test/integration/emailing/campaign-mcp-tools.integration-spec.ts
index 046a7499c73..586783c109a 100644
--- a/packages/twenty-server/test/integration/emailing/campaign-mcp-tools.integration-spec.ts
+++ b/packages/twenty-server/test/integration/emailing/campaign-mcp-tools.integration-spec.ts
@@ -5,13 +5,9 @@ import { destroyOneOperationFactory } from 'test/integration/graphql/utils/destr
import { findOneOperation } from 'test/integration/graphql/utils/find-one-operation.util';
import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
-import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { EMAIL_DOCUMENT_SCHEMA_VERSION } from 'twenty-shared/utils';
import { v4 } from 'uuid';
-import { type FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
const SENDABLE_BODY_TEMPLATE = JSON.stringify({
@@ -63,7 +59,6 @@ describe('Campaign lifecycle tools through MCP (integration)', () => {
const campaignId = v4();
const suppressedEmailAddress = `mcp-suppressed-${v4()}@example.com`;
let suppressionId: string;
- let wasMessageCampaignEnabled: boolean;
const readCampaignStatus = async (): Promise<string> => {
const { data } = await findOneOperation({
@@ -76,20 +71,6 @@ describe('Campaign lifecycle tools through MCP (integration)', () => {
};
beforeAll(async () => {
- wasMessageCampaignEnabled =
- await getAppProviderByClassName<FeatureFlagService>(
- 'FeatureFlagService',
- ).isFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- SEED_APPLE_WORKSPACE_ID,
- );
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
-
await testDataSource.query(
`INSERT INTO "core"."emailingDomain"
("workspaceId", "domain", "status", "verifiedAt", "unsubscribeHostname", "unsubscribeHostnameStatus")
@@ -134,12 +115,6 @@ describe('Campaign lifecycle tools through MCP (integration)', () => {
`DELETE FROM "core"."emailingDomain" WHERE "domain" = $1`,
[domain],
);
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: wasMessageCampaignEnabled,
- expectToFail: false,
- });
});
it('should preview the audience of a ready campaign', async () => {
diff --git a/packages/twenty-server/test/integration/emailing/campaign-send-preview.integration-spec.ts b/packages/twenty-server/test/integration/emailing/campaign-send-preview.integration-spec.ts
index e7dc80c615b..30e129f8eba 100644
--- a/packages/twenty-server/test/integration/emailing/campaign-send-preview.integration-spec.ts
+++ b/packages/twenty-server/test/integration/emailing/campaign-send-preview.integration-spec.ts
@@ -1,13 +1,9 @@
import gql from 'graphql-tag';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
-import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { EMAIL_DOCUMENT_SCHEMA_VERSION } from 'twenty-shared/utils';
import { v4 } from 'uuid';
import { EmailingDomainExceptionCode } from 'src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception';
-import { type FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
@@ -45,7 +41,6 @@ describe('previewMessageCampaignSend (integration)', () => {
const personId = v4();
const memberId = v4();
const seededCampaignIds: string[] = [];
- let wasMessageCampaignEnabled: boolean;
const seedCampaign = async ({
subject,
@@ -87,20 +82,6 @@ describe('previewMessageCampaignSend (integration)', () => {
};
beforeAll(async () => {
- wasMessageCampaignEnabled =
- await getAppProviderByClassName<FeatureFlagService>(
- 'FeatureFlagService',
- ).isFeatureEnabled(
- FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- SEED_APPLE_WORKSPACE_ID,
- );
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
-
await testDataSource.query(
`INSERT INTO "core"."emailingDomain"
("workspaceId", "domain", "status", "verifiedAt", "unsubscribeHostname", "unsubscribeHostnameStatus")
@@ -150,12 +131,6 @@ describe('previewMessageCampaignSend (integration)', () => {
`DELETE FROM "core"."emailingDomain" WHERE "domain" = $1`,
[domain],
);
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: wasMessageCampaignEnabled,
- expectToFail: false,
- });
});
it('asks for the list first when a draft has neither a list nor a subject', async () => {
diff --git a/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap b/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap
index c0f4dc53a08..758ccccd633 100644
--- a/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap
@@ -303,11 +303,11 @@ exports[`endpoint permission declarations should match the auth principals, perm
"EmailingDomainResolver.deleteEmailingDomain {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":true,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"EmailingDomainResolver.getEmailingDomains {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"EmailingDomainResolver.verifyEmailingDomain {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":true,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
- "EmailingSendResolver.cancelMessageCampaign {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "EmailingSendResolver.previewMessageCampaignAudience {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "EmailingSendResolver.previewMessageCampaignSend {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":false,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "EmailingSendResolver.sendMessageCampaign {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "EmailingSendResolver.sendMessageCampaignTest {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
+ "EmailingSendResolver.cancelMessageCampaign {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "EmailingSendResolver.previewMessageCampaignAudience {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "EmailingSendResolver.previewMessageCampaignSend {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":false,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "EmailingSendResolver.sendMessageCampaign {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "EmailingSendResolver.sendMessageCampaignTest {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"EnterpriseResolver.enterpriseCheckoutSession {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"EnterpriseResolver.enterprisePortalSession {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"EnterpriseResolver.enterpriseSubscriptionStatus {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
@@ -395,11 +395,11 @@ exports[`endpoint permission declarations should match the auth principals, perm
"MessageFolderResolver.myMessageFolders {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"MessageFolderResolver.updateMessageFolder {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"MessageFolderResolver.updateMessageFolders {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
- "MessageListResolver.duplicateMessageList {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":[]}",
- "MessageListResolver.triggerAddPeopleToMessageListJob {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":true,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":[]}",
- "MessageSuppressionResolver.createMessageSuppression {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "MessageSuppressionResolver.deleteMessageSuppression {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "MessageSuppressionResolver.messageSuppressions {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
+ "MessageListResolver.duplicateMessageList {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
+ "MessageListResolver.triggerAddPeopleToMessageListJob {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}},{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":true,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
+ "MessageSuppressionResolver.createMessageSuppression {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "MessageSuppressionResolver.deleteMessageSuppression {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "MessageSuppressionResolver.messageSuppressions {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"MessagingWebhooksController.handleResendWebhook {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"MessagingWebhooksController.handleSesInboundWebhook {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"MessagingWebhooksController.handleSesOutboundWebhook {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
@@ -570,10 +570,10 @@ exports[`endpoint permission declarations should match the auth principals, perm
"UnsubscribeController.handlePreferencesPage {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"UnsubscribeController.handleUnsubscribeAll {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
"UnsubscribeController.handleUpdatePreferences {"applicationTarget":null,"authPrincipalGuards":[],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",
- "UnsubscribeTopicResolver.createUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "UnsubscribeTopicResolver.deleteUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "UnsubscribeTopicResolver.unsubscribeTopics {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
- "UnsubscribeTopicResolver.updateUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_MESSAGE_CAMPAIGN_ENABLED"],"requiredPermissionFlags":["WORKSPACE"]}",
+ "UnsubscribeTopicResolver.createUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "UnsubscribeTopicResolver.deleteUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "UnsubscribeTopicResolver.unsubscribeTopics {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
+ "UnsubscribeTopicResolver.updateUnsubscribeTopic {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"UsageLimitResolver.createUsageLimit {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"UsageLimitResolver.deleteUsageLimit {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
"UsageLimitResolver.updateUsageLimit {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":true,"application":{"withAgent":false,"withUser":true,"withoutUser":true},"oauthClient":{"withUser":true,"withoutUser":true},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":["WORKSPACE"]}",
diff --git a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts
index 5ad7c7d78ad..1e9f546ee74 100644
--- a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts
@@ -1,8 +1,6 @@
import { gql } from 'graphql-tag';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { v4 } from 'uuid';
import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
@@ -29,25 +27,11 @@ describe('tracking opt-out as a suppression (integration)', () => {
let messageSuppressionService: MessageSuppressionService;
const usedEmailAddresses: string[] = [];
- beforeAll(async () => {
+ beforeAll(() => {
messageSuppressionService =
getAppProviderByClassName<MessageSuppressionService>(
'MessageSuppressionService',
);
-
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
- });
-
- afterAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: false,
- expectToFail: false,
- });
});
afterEach(async () => {
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.ts
index 970678cdec8..d53b981de66 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
@@ -1,7 +1,5 @@
import { gql } from 'graphql-tag';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { v4 } from 'uuid';
import { isDefined } from 'twenty-shared/utils';
@@ -44,22 +42,6 @@ const MESSAGE_SUPPRESSIONS = gql`
describe('messageSuppressionResolver (integration)', () => {
const createdSuppressionIds: string[] = [];
- beforeAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
- });
-
- afterAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: false,
- expectToFail: false,
- });
- });
-
afterEach(async () => {
for (const id of createdSuppressionIds) {
await testDataSource
@@ -167,32 +149,6 @@ describe('messageSuppressionResolver (integration)', () => {
});
});
- it('should refuse the list query when message campaigns are disabled for the workspace', async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: false,
- expectToFail: false,
- });
-
- try {
- const listResponse = await makeMetadataApiRequest({
- query: MESSAGE_SUPPRESSIONS,
- variables: { input: { searchTerm: '', limit: 30, offset: 0 } },
- });
-
- expect(listResponse.body.data).toBeNull();
- expect(listResponse.body.errors[0].message).toBe(
- `Feature flag "${FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED}" is not enabled for this workspace`,
- );
- } finally {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
- }
- });
-
it('should fail when the suppression does not exist', async () => {
const deleteResponse = await makeMetadataApiRequest({
query: DELETE_MESSAGE_SUPPRESSION,
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.ts
index 56eae8cc75f..9047eb7cf8b 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
@@ -1,7 +1,5 @@
import { gql } from 'graphql-tag';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
-import { FeatureFlagKey } from 'twenty-shared/types';
const CREATE_UNSUBSCRIBE_TOPIC = gql`
mutation CreateUnsubscribeTopic($input: CreateUnsubscribeTopicInput!) {
@@ -45,22 +43,6 @@ const UNSUBSCRIBE_TOPICS = gql`
describe('unsubscribeTopicResolver (integration)', () => {
const createdTopicIds: string[] = [];
- beforeAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: true,
- expectToFail: false,
- });
- });
-
- afterAll(async () => {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
- value: false,
- expectToFail: false,
- });
- });
-
afterEach(async () => {
for (const id of createdTopicIds) {
await testDataSource
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266150123-remove-message-campaign-flag.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266150123-remove-message-campaign-flag.integration-spec.ts
new file mode 100644
index 00000000000..22e3b797662
--- /dev/null
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266150123-remove-message-campaign-flag.integration-spec.ts
@@ -0,0 +1,90 @@
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+
+import { type RemoveMessageCampaignFlagCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266150123-remove-message-campaign-flag.command';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const RUN_ON_WORKSPACE_ARGS = {
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ options: {},
+ index: 0,
+ total: 1,
+};
+
+const FLAG = 'featureFlags.IS_MESSAGE_CAMPAIGN_ENABLED';
+
+type CommandMenuItemRow = {
+ universalIdentifier: string;
+ label: string;
+ isPinned: boolean;
+ isActive: boolean;
+ position: number;
+ availabilityType: string;
+ conditionalAvailabilityExpression: string | null;
+ conditionalPinnedExpression: string | null;
+ overrides: unknown;
+};
+
+const readCommandMenuItems = async (): Promise<CommandMenuItemRow[]> =>
+ global.testDataSource.query(
+ `SELECT "universalIdentifier", "label", "isPinned", "isActive", "position",
+ "availabilityType", "conditionalAvailabilityExpression",
+ "conditionalPinnedExpression", "overrides"
+ FROM core."commandMenuItem"
+ WHERE "workspaceId" = $1
+ ORDER BY "universalIdentifier"`,
+ [SEED_APPLE_WORKSPACE_ID],
+ );
+
+describe('2-54 workspace command - remove message campaign flag (integration)', () => {
+ let command: RemoveMessageCampaignFlagCommand;
+
+ beforeAll(() => {
+ command = getAppProviderByClassName<RemoveMessageCampaignFlagCommand>(
+ 'RemoveMessageCampaignFlagCommand',
+ );
+ });
+
+ afterAll(async () => {
+ await command.up(RUN_ON_WORKSPACE_ARGS);
+ });
+
+ it('puts the flag back on down and restores every command menu item exactly on up', async () => {
+ const commandMenuItemsBefore = await readCommandMenuItems();
+
+ expect(
+ commandMenuItemsBefore.filter(({ conditionalAvailabilityExpression }) =>
+ conditionalAvailabilityExpression?.includes(FLAG),
+ ),
+ ).toEqual([]);
+
+ await command.down(RUN_ON_WORKSPACE_ARGS);
+
+ const commandMenuItemsAfterDown = await readCommandMenuItems();
+ const flaggedUniversalIdentifiers = commandMenuItemsAfterDown
+ .filter(({ conditionalAvailabilityExpression }) =>
+ conditionalAvailabilityExpression?.includes(FLAG),
+ )
+ .map(({ universalIdentifier }) => universalIdentifier);
+
+ expect(flaggedUniversalIdentifiers).toHaveLength(11);
+ expect(
+ commandMenuItemsAfterDown.filter(
+ ({ universalIdentifier }) =>
+ !flaggedUniversalIdentifiers.includes(universalIdentifier),
+ ),
+ ).toEqual(
+ commandMenuItemsBefore.filter(
+ ({ universalIdentifier }) =>
+ !flaggedUniversalIdentifiers.includes(universalIdentifier),
+ ),
+ );
+
+ await command.up(RUN_ON_WORKSPACE_ARGS);
+
+ expect(await readCommandMenuItems()).toEqual(commandMenuItemsBefore);
+
+ await command.up(RUN_ON_WORKSPACE_ARGS);
+
+ expect(await readCommandMenuItems()).toEqual(commandMenuItemsBefore);
+ });
+});
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index 17d01e7e358..3027c25900c 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -1,6 +1,5 @@
export enum FeatureFlagKey {
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',
- IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',