The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add a Campaigns folder with Campaigns and Lists to the navigation menu (#28931)
neo773a0a95f55d979
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.tsindex e066ee82ee2..5fceb02c869 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@@ -4,6 +4,7 @@ import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/wimport { 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 { AddCampaignsNavigationFolderCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.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';@@ -19,6 +20,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceAddMergeWithRecordCommandMenuItemCommand,UpdateCrmHygieneSkillMergeGuidanceCommand,RemoveMessageCampaignFlagCommand,+ AddCampaignsNavigationFolderCommand,],})export class V2_54_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.command.tsnew file mode 100644index 00000000000..021ef6a1209--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.command.ts@@ -0,0 +1,154 @@+import { Inject } from '@nestjs/common';+import { Command } from 'nest-commander';+import { isDefined } from 'twenty-shared/utils';+import { v4 } from 'uuid';++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 { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import {+ STANDARD_NAVIGATION_MENU_ITEM_DEFAULT_COLORS,+ STANDARD_NAVIGATION_MENU_ITEMS,+} from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant';+import {+ createStandardNavigationMenuItemFolderFlatMetadata,+ createStandardNavigationMenuItemFolderItemFlatMetadata,+} from 'src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-folder-flat-metadata.util';+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';++const CAMPAIGNS_FOLDER = STANDARD_NAVIGATION_MENU_ITEMS.campaignsFolder;++const CAMPAIGNS_FOLDER_ITEMS = [+ STANDARD_NAVIGATION_MENU_ITEMS.allMessageCampaigns,+ STANDARD_NAVIGATION_MENU_ITEMS.allMessageLists,+];++@RegisteredWorkspaceCommand('2.54.0', 1793266210456)+@Command({+ name: 'upgrade:2-54:add-campaigns-navigation-folder',+ description:+ 'Add the Campaigns folder holding Campaigns and Lists to the navigation menu',+})+export class AddCampaignsNavigationFolderCommand extends ProvisionedWorkspaceCommandRunner {+ @Inject(ApplicationService)+ private readonly applicationService: ApplicationService;++ @Inject(WorkspaceCacheService)+ private readonly workspaceCacheService: WorkspaceCacheService;++ @Inject(WorkspaceMigrationValidateBuildAndRunService)+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService;++ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );+ const { flatNavigationMenuItemMaps, flatViewMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatNavigationMenuItemMaps',+ 'flatViewMaps',+ ]);++ const isMissingCampaignViews = CAMPAIGNS_FOLDER_ITEMS.some(+ ({ viewUniversalIdentifier }) =>+ !isDefined(flatViewMaps.byUniversalIdentifier[viewUniversalIdentifier]),+ );++ if (isMissingCampaignViews) {+ this.logger.warn(+ `Workspace ${workspaceId}: campaign or list view missing, skipping the Campaigns navigation folder`,+ );++ return;+ }++ const now = new Date().toISOString();++ const folder =+ flatNavigationMenuItemMaps.byUniversalIdentifier[+ CAMPAIGNS_FOLDER.universalIdentifier+ ] ??+ createStandardNavigationMenuItemFolderFlatMetadata({+ universalIdentifier: CAMPAIGNS_FOLDER.universalIdentifier,+ name: CAMPAIGNS_FOLDER.name,+ icon: CAMPAIGNS_FOLDER.icon,+ color:+ STANDARD_NAVIGATION_MENU_ITEM_DEFAULT_COLORS.campaignsFolder ?? null,+ position: CAMPAIGNS_FOLDER.position,+ navigationMenuItemId: v4(),+ workspaceId,+ twentyStandardApplicationId: twentyStandardFlatApplication.id,+ now,+ });++ const folderItems = CAMPAIGNS_FOLDER_ITEMS.map((folderItemDefinition) =>+ createStandardNavigationMenuItemFolderItemFlatMetadata({+ universalIdentifier: folderItemDefinition.universalIdentifier,+ viewUniversalIdentifier: folderItemDefinition.viewUniversalIdentifier,+ folderId: folder.id,+ folderUniversalIdentifier:+ folderItemDefinition.folderUniversalIdentifier,+ position: folderItemDefinition.position,+ navigationMenuItemId: v4(),+ workspaceId,+ twentyStandardApplicationId: twentyStandardFlatApplication.id,+ dependencyFlatEntityMaps: { flatViewMaps },+ now,+ }),+ );++ const navigationMenuItemsToCreate = [folder, ...folderItems].filter(+ ({ universalIdentifier }) =>+ !isDefined(+ flatNavigationMenuItemMaps.byUniversalIdentifier[universalIdentifier],+ ),+ );++ if (navigationMenuItemsToCreate.length === 0) {+ return;+ }++ this.logger.log(+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: creating ${navigationMenuItemsToCreate.length} Campaigns navigation item(s)`,+ );++ if (options.dryRun) {+ return;+ }++ const result =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(+ {+ isSystemBuild: true,+ applicationUniversalIdentifier:+ twentyStandardFlatApplication.universalIdentifier,+ workspaceId,+ allFlatEntityOperationByMetadataName: {+ navigationMenuItem: {+ flatEntityToCreate: navigationMenuItemsToCreate,+ flatEntityToDelete: [],+ flatEntityToUpdate: [],+ },+ },+ },+ );++ if (result.status === 'fail') {+ throw new WorkspaceMigrationBuilderException(result);+ }+ }+}diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant.tsindex 9b36d62020d..228176f8c2c 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant.ts@@ -47,13 +47,31 @@ export const STANDARD_NAVIGATION_MENU_ITEMS = {STANDARD_OBJECTS.dashboard.views.allDashboards.universalIdentifier,position: 5,},+ campaignsFolder: {+ universalIdentifier: '20202020-b00c-4b0c-8b0c-c0aba11c000c',+ type: NavigationMenuItemType.FOLDER,+ name: i18nLabel(+ msg({ message: `Campaigns`, context: 'navigationMenuItem.name' }),+ ),+ icon: 'IconSend',+ position: 7,+ },allMessageCampaigns: {universalIdentifier: '20202020-b00b-4b0b-8b0b-c0aba11c000b',type: NavigationMenuItemType.OBJECT,viewUniversalIdentifier:STANDARD_OBJECTS.messageCampaign.views.allMessageCampaigns.universalIdentifier,- position: 7,+ folderUniversalIdentifier: '20202020-b00c-4b0c-8b0c-c0aba11c000c',+ position: 0,+ },+ allMessageLists: {+ universalIdentifier: '20202020-b00d-4b0d-8b0d-c0aba11c000d',+ type: NavigationMenuItemType.OBJECT,+ viewUniversalIdentifier:+ STANDARD_OBJECTS.messageList.views.allMessageLists.universalIdentifier,+ folderUniversalIdentifier: '20202020-b00c-4b0c-8b0c-c0aba11c000c',+ position: 1,},workflowsFolder: {universalIdentifier: '20202020-b007-4b07-8b07-c0aba11c0007',@@ -100,7 +118,9 @@ export const STANDARD_NAVIGATION_MENU_ITEM_DEFAULT_COLORS: Partial<allNotes: 'turquoise',allOpportunities: 'red',workflowsFolder: 'orange',+ campaignsFolder: 'purple',allMessageCampaigns: 'gray',+ allMessageLists: 'gray',allDashboards: 'gray',workflowsFolderAllWorkflows: 'gray',workflowsFolderAllWorkflowRuns: 'gray',diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/build-standard-flat-navigation-menu-item-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/build-standard-flat-navigation-menu-item-maps.util.tsindex bbec1ba544a..6c882eeb14d 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/build-standard-flat-navigation-menu-item-maps.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/build-standard-flat-navigation-menu-item-maps.util.ts@@ -5,7 +5,10 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typimport { type FlatNavigationMenuItemMaps } from 'src/engine/metadata-modules/flat-navigation-menu-item/types/flat-navigation-menu-item-maps.type';import { addFlatNavigationMenuItemToMapsAndUpdateIndex } from 'src/engine/metadata-modules/flat-navigation-menu-item/utils/add-flat-navigation-menu-item-to-maps-and-update-index.util';import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';-import { STANDARD_NAVIGATION_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant';+import {+ STANDARD_NAVIGATION_MENU_ITEM_DEFAULT_COLORS,+ STANDARD_NAVIGATION_MENU_ITEMS,+} from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant';import { createStandardNavigationMenuItemFlatMetadata } from 'src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-flat-metadata.util';import {createStandardNavigationMenuItemFolderFlatMetadata,@@ -21,10 +24,19 @@ const FLAT_NAVIGATION_MENU_ITEM_NAMES = ['allTasks',] as const;-const WORKFLOWS_FOLDER_ITEM_NAMES = [- 'workflowsFolderAllWorkflows',- 'workflowsFolderAllWorkflowRuns',- 'workflowsFolderAllWorkflowVersions',+const FOLDERS = [+ {+ folderName: 'workflowsFolder',+ itemNames: [+ 'workflowsFolderAllWorkflows',+ 'workflowsFolderAllWorkflowRuns',+ 'workflowsFolderAllWorkflowVersions',+ ],+ },+ {+ folderName: 'campaignsFolder',+ itemNames: ['allMessageCampaigns', 'allMessageLists'],+ },] as const;export const buildStandardFlatNavigationMenuItemMaps = ({@@ -71,47 +83,53 @@ export const buildStandardFlatNavigationMenuItemMaps = ({});}- const workflowsFolderDefinition =- STANDARD_NAVIGATION_MENU_ITEMS.workflowsFolder;- const workflowsFolderId = v4();- const workflowsFolder = createStandardNavigationMenuItemFolderFlatMetadata({- universalIdentifier: workflowsFolderDefinition.universalIdentifier,- name: workflowsFolderDefinition.name,- icon: workflowsFolderDefinition.icon,- position: workflowsFolderDefinition.position,- navigationMenuItemId: workflowsFolderId,- workspaceId,- twentyStandardApplicationId,- now,- });-- addFlatNavigationMenuItemToMapsAndUpdateIndex({- flatNavigationMenuItem: workflowsFolder,- flatNavigationMenuItemMaps,- });-- for (const folderItemName of WORKFLOWS_FOLDER_ITEM_NAMES) {- const folderItemDefinition = STANDARD_NAVIGATION_MENU_ITEMS[folderItemName];-- const folderItem = createStandardNavigationMenuItemFolderItemFlatMetadata({- universalIdentifier: folderItemDefinition.universalIdentifier,- viewUniversalIdentifier: folderItemDefinition.viewUniversalIdentifier,- folderId: workflowsFolderId,- folderUniversalIdentifier: folderItemDefinition.folderUniversalIdentifier,- position: folderItemDefinition.position,- navigationMenuItemId: v4(),+ for (const { folderName, itemNames } of FOLDERS) {+ const folderDefinition = STANDARD_NAVIGATION_MENU_ITEMS[folderName];+ const folderId = v4();+ const folder = createStandardNavigationMenuItemFolderFlatMetadata({+ universalIdentifier: folderDefinition.universalIdentifier,+ name: folderDefinition.name,+ icon: folderDefinition.icon,+ color: STANDARD_NAVIGATION_MENU_ITEM_DEFAULT_COLORS[folderName] ?? null,+ position: folderDefinition.position,+ navigationMenuItemId: folderId,workspaceId,twentyStandardApplicationId,- dependencyFlatEntityMaps: {- flatViewMaps,- },now,});addFlatNavigationMenuItemToMapsAndUpdateIndex({- flatNavigationMenuItem: folderItem,+ flatNavigationMenuItem: folder,flatNavigationMenuItemMaps,});++ for (const folderItemName of itemNames) {+ const folderItemDefinition =+ STANDARD_NAVIGATION_MENU_ITEMS[folderItemName];++ const folderItem = createStandardNavigationMenuItemFolderItemFlatMetadata(+ {+ universalIdentifier: folderItemDefinition.universalIdentifier,+ viewUniversalIdentifier: folderItemDefinition.viewUniversalIdentifier,+ folderId,+ folderUniversalIdentifier:+ folderItemDefinition.folderUniversalIdentifier,+ position: folderItemDefinition.position,+ navigationMenuItemId: v4(),+ workspaceId,+ twentyStandardApplicationId,+ dependencyFlatEntityMaps: {+ flatViewMaps,+ },+ now,+ },+ );++ addFlatNavigationMenuItemToMapsAndUpdateIndex({+ flatNavigationMenuItem: folderItem,+ flatNavigationMenuItemMaps,+ });+ }}return flatNavigationMenuItemMaps;diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-folder-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-folder-flat-metadata.util.tsindex 71b860bbb1e..ca5f5475b41 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-folder-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/navigation-menu-item/create-standard-navigation-menu-item-folder-flat-metadata.util.ts@@ -9,6 +9,7 @@ export const createStandardNavigationMenuItemFolderFlatMetadata = ({universalIdentifier,name,icon,+ color,position,navigationMenuItemId,workspaceId,@@ -18,6 +19,7 @@ export const createStandardNavigationMenuItemFolderFlatMetadata = ({universalIdentifier: string;name: string;icon?: string | null;+ color: string | null;position: number;navigationMenuItemId: string;workspaceId: string;@@ -46,7 +48,7 @@ export const createStandardNavigationMenuItemFolderFlatMetadata = ({name,link: null,icon: icon ?? null,- color: 'orange',+ color,position,createdAt: now,updatedAt: now,diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.integration-spec.tsnew file mode 100644index 00000000000..ca16b71373f--- /dev/null+++ b/packages/twenty-server/test/integration/upgrade/suites/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.integration-spec.ts@@ -0,0 +1,169 @@+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import { In } from 'typeorm';++import { type AddCampaignsNavigationFolderCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793266210456-add-campaigns-navigation-folder.command';+import { NavigationMenuItemEntity } from 'src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { STANDARD_NAVIGATION_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-navigation-menu-item.constant';++const CAMPAIGNS_FOLDER_UNIVERSAL_IDENTIFIER =+ STANDARD_NAVIGATION_MENU_ITEMS.campaignsFolder.universalIdentifier;++const LISTS_UNIVERSAL_IDENTIFIER =+ STANDARD_NAVIGATION_MENU_ITEMS.allMessageLists.universalIdentifier;++const CAMPAIGNS_NAVIGATION_UNIVERSAL_IDENTIFIERS: string[] = [+ CAMPAIGNS_FOLDER_UNIVERSAL_IDENTIFIER,+ STANDARD_NAVIGATION_MENU_ITEMS.allMessageCampaigns.universalIdentifier,+ LISTS_UNIVERSAL_IDENTIFIER,+];++type NavigationMenuItemRow = {+ id: string;+ universalIdentifier: string;+ type: string;+ folderId: string | null;+ targetObjectNameSingular: string | null;+ name: string | null;+ position: number;+};++const readNavigationMenuItems = async (): Promise<NavigationMenuItemRow[]> =>+ global.testDataSource.query(+ `SELECT n."id", n."universalIdentifier", n."type", n."folderId", n."name",+ n."position", o."nameSingular" AS "targetObjectNameSingular"+ FROM core."navigationMenuItem" n+ LEFT JOIN core."objectMetadata" o ON o."id" = n."targetObjectMetadataId"+ WHERE n."workspaceId" = $1+ ORDER BY n."universalIdentifier"`,+ [SEED_APPLE_WORKSPACE_ID],+ );++const isCampaignsNavigationMenuItem = ({+ universalIdentifier,+}: Pick<NavigationMenuItemRow, 'universalIdentifier'>) =>+ CAMPAIGNS_NAVIGATION_UNIVERSAL_IDENTIFIERS.includes(universalIdentifier);++const deleteNavigationMenuItems = async (universalIdentifiers: string[]) => {+ await getCoreRepository<NavigationMenuItemEntity>(+ NavigationMenuItemEntity,+ ).delete({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ universalIdentifier: In(universalIdentifiers),+ });++ await getAppProviderByClassName<WorkspaceCacheService>(+ 'WorkspaceCacheService',+ ).invalidateAndRecompute(SEED_APPLE_WORKSPACE_ID, [+ 'flatNavigationMenuItemMaps',+ ]);+};++describe('2-54 workspace command - add campaigns navigation folder (integration)', () => {+ let command: AddCampaignsNavigationFolderCommand;++ const runCommand = () =>+ command.runOnWorkspace({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+ });++ beforeAll(() => {+ command = getAppProviderByClassName<AddCampaignsNavigationFolderCommand>(+ 'AddCampaignsNavigationFolderCommand',+ );+ });++ afterAll(async () => {+ await runCommand();+ });++ it('creates the folder linked to the real campaign and list objects, once', async () => {+ const otherNavigationMenuItemsBefore = (+ await readNavigationMenuItems()+ ).filter(+ (navigationMenuItem) =>+ !isCampaignsNavigationMenuItem(navigationMenuItem),+ );++ await deleteNavigationMenuItems(CAMPAIGNS_NAVIGATION_UNIVERSAL_IDENTIFIERS);++ await runCommand();+ await runCommand();++ const navigationMenuItemsAfter = await readNavigationMenuItems();+ const campaignsNavigationMenuItems = navigationMenuItemsAfter.filter(+ isCampaignsNavigationMenuItem,+ );+ const folder = campaignsNavigationMenuItems.find(+ ({ universalIdentifier }) =>+ universalIdentifier === CAMPAIGNS_FOLDER_UNIVERSAL_IDENTIFIER,+ );++ expect(+ navigationMenuItemsAfter.filter(+ (navigationMenuItem) =>+ !isCampaignsNavigationMenuItem(navigationMenuItem),+ ),+ ).toEqual(otherNavigationMenuItemsBefore);+ expect(folder).toMatchObject({+ type: 'FOLDER',+ name: 'Campaigns',+ folderId: null,+ });+ expect(+ campaignsNavigationMenuItems+ .filter(({ type }) => type === 'OBJECT')+ .map(({ folderId, targetObjectNameSingular, position }) => ({+ folderId,+ targetObjectNameSingular,+ position,+ })),+ ).toEqual(+ expect.arrayContaining([+ {+ folderId: folder?.id,+ targetObjectNameSingular: 'messageCampaign',+ position: 0,+ },+ {+ folderId: folder?.id,+ targetObjectNameSingular: 'messageList',+ position: 1,+ },+ ]),+ );+ expect(campaignsNavigationMenuItems).toHaveLength(3);+ });++ it('puts a missing Lists item back into the existing folder', async () => {+ const folderBefore = (await readNavigationMenuItems()).find(+ ({ universalIdentifier }) =>+ universalIdentifier === CAMPAIGNS_FOLDER_UNIVERSAL_IDENTIFIER,+ );++ await deleteNavigationMenuItems([LISTS_UNIVERSAL_IDENTIFIER]);++ await runCommand();++ const campaignsNavigationMenuItems = (+ await readNavigationMenuItems()+ ).filter(isCampaignsNavigationMenuItem);++ expect(+ campaignsNavigationMenuItems.find(+ ({ universalIdentifier }) =>+ universalIdentifier === LISTS_UNIVERSAL_IDENTIFIER,+ ),+ ).toMatchObject({+ folderId: folderBefore?.id,+ targetObjectNameSingular: 'messageList',+ position: 1,+ });+ expect(campaignsNavigationMenuItems).toHaveLength(3);+ });+});