[REQUIRES_CACHE_FLUSH][GQL_VIEW_GROUP_API_BREAKING_CHANGE] ViewGroup in v2 (#15052)

# Introduction
Adding view-group to core engine v2
Following https://github.com/twentyhq/twenty/pull/15010 ( same pattern )

## What's done
- Created flat-view-group
- flat view group runner
- flat view group builder
- create view group service v2 and input transpilers
- refactor the existing view group resolver to fix standard (
BREAKING_CHANGE on graphql api update especially ) REST stays the same
- refactored the front to consume the mutations autogenerated

close https://github.com/twentyhq/core-team-issues/issues/1665

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-maps-properties.constant.ts

@@ -1,14 +1,6 @@
-import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { ALL_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-name.constant';
+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
 
-export const ALL_FLAT_ENTITY_MAPS_PROPERTIES = [
-  'flatObjectMetadataMaps',
-  'flatViewFieldMaps',
-  'flatViewMaps',
-  'flatIndexMaps',
-  'flatServerlessFunctionMaps',
-  'flatDatabaseEventTriggerMaps',
-  'flatCronTriggerMaps',
-  'flatRouteTriggerMaps',
-  'flatFieldMetadataMaps',
-  'flatViewFilterMaps',
-] as const satisfies (keyof AllFlatEntityMaps)[];
+export const ALL_FLAT_ENTITY_MAPS_PROPERTIES = Object.keys(
+  ALL_METADATA_NAME,
+).map(getMetadataFlatEntityMapsKey);

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-properties-to-compare-and-stringify.constant.ts

@@ -5,6 +5,7 @@ import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity
 import { FLAT_FIELD_METADATA_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-field-metadata/constants/flat-field-metadata-editable-properties.constant';
 import { FLAT_VIEW_FIELD_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-field/constants/flat-view-field-editable-properties.constant';
 import { FLAT_VIEW_FILTER_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-filter/constants/flat-view-filter-editable-properties.constant';
+import { FLAT_VIEW_GROUP_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-group/constants/flat-view-group-editable-properties.constant';
 import { FLAT_VIEW_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view/constants/flat-view-editable-properties.constant';
 import { FLAT_ROUTE_TRIGGER_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/route-trigger/constants/flat-route-trigger-editable-properties.constant';
 import { FLAT_SERVERLESS_FUNCTION_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/serverless-function/constants/flat-serverless-function-editable-properties.constant';
@@ -49,6 +50,10 @@ export const ALL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY = {
     propertiesToCompare: [...FLAT_VIEW_FIELD_EDITABLE_PROPERTIES, 'deletedAt'],
     propertiesToStringify: [],
   },
+  viewGroup: {
+    propertiesToCompare: [...FLAT_VIEW_GROUP_EDITABLE_PROPERTIES, 'deletedAt'],
+    propertiesToStringify: [],
+  },
   index: {
     propertiesToCompare: [
       'indexType',

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-many-to-one-relations.constant.ts

@@ -42,6 +42,10 @@ export const ALL_METADATA_NAME_MANY_TO_ONE_RELATIONS = {
     view: 'viewId',
     fieldMetadata: 'fieldMetadataId',
   },
+  viewGroup: {
+    view: 'viewId',
+    fieldMetadata: 'fieldMetadataId',
+  },
   index: {
     objectMetadata: 'objectMetadataId',
   },

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-name.constant.ts

@@ -3,6 +3,7 @@ export const ALL_METADATA_NAME = {
   objectMetadata: 'objectMetadata',
   view: 'view',
   viewField: 'viewField',
+  viewGroup: 'viewGroup',
   index: 'index',
   serverlessFunction: 'serverlessFunction',
   cronTrigger: 'cronTrigger',

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts

@@ -43,4 +43,8 @@ export const ALL_METADATA_REQUIRED_METADATA_FOR_VALIDATION = {
     view: true,
     fieldMetadata: true,
   },
+  viewGroup: {
+    fieldMetadata: true,
+    view: true,
+  },
 } as const satisfies MetadataRequiredForValidation;

packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/empty-all-flat-entity-maps.constant.ts

@@ -1,15 +1,15 @@
+import { ALL_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-name.constant';
 import { EMPTY_FLAT_ENTITY_MAPS } from 'src/engine/metadata-modules/flat-entity/constant/empty-flat-entity-maps.constant';
 import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { type AllMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-metadata-name.type';
+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
 
-export const EMPTY_ALL_FLAT_ENTITY_MAPS = {
-  flatObjectMetadataMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatFieldMetadataMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatIndexMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatViewFieldMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatViewMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatServerlessFunctionMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatCronTriggerMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatDatabaseEventTriggerMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatRouteTriggerMaps: EMPTY_FLAT_ENTITY_MAPS,
-  flatViewFilterMaps: EMPTY_FLAT_ENTITY_MAPS,
-} as const satisfies AllFlatEntityMaps;
+export const EMPTY_ALL_FLAT_ENTITY_MAPS = (
+  Object.keys(ALL_METADATA_NAME) as AllMetadataName[]
+).reduce<AllFlatEntityMaps>(
+  (acc, metadataName) => ({
+    ...acc,
+    [getMetadataFlatEntityMapsKey(metadataName)]: EMPTY_FLAT_ENTITY_MAPS,
+  }),
+  {} as AllFlatEntityMaps,
+);

packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-by-metadata-engine-name-test.type.ts

@@ -1,6 +1,7 @@
 import { type Expect } from 'twenty-shared/testing';
 
 import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-metadata-name.type';
 import { type FlatEntity } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type';
 import { type WorkspaceMigrationActionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/workspace-migration-action-common-v2';
 
@@ -19,6 +20,16 @@ type ExpectedGenericAllFlatEntityInformationByMetadataEngine = {
 
 // eslint-disable-next-line unused-imports/no-unused-vars
 type Assertions = [
+  Expect<
+    keyof AllFlatEntityTypesByMetadataName extends AllMetadataName
+      ? true
+      : false
+  >,
+  Expect<
+    AllMetadataName extends keyof AllFlatEntityTypesByMetadataName
+      ? true
+      : false
+  >,
   Expect<
     AllFlatEntityTypesByMetadataName extends ExpectedGenericAllFlatEntityInformationByMetadataEngine
       ? true

packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts

@@ -8,6 +8,7 @@ import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-m
 import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
 import { type FlatViewField } from 'src/engine/metadata-modules/flat-view-field/types/flat-view-field.type';
 import { type FlatViewFilter } from 'src/engine/metadata-modules/flat-view-filter/types/flat-view-filter.type';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
 import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';
 import { type IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
@@ -17,6 +18,7 @@ import { type ServerlessFunctionEntity } from 'src/engine/metadata-modules/serve
 import { type FlatServerlessFunction } from 'src/engine/metadata-modules/serverless-function/types/flat-serverless-function.type';
 import { type ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
 import { type ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';
+import { type ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
 import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
 import {
   type CreateCronTriggerAction,
@@ -62,6 +64,11 @@ import {
   type DeleteViewFilterAction,
   type UpdateViewFilterAction,
 } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/view-filter/types/workspace-migration-view-filter-action-v2.type';
+import {
+  type CreateViewGroupAction,
+  type DeleteViewGroupAction,
+  type UpdateViewGroupAction,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/view-group/types/workspace-migration-view-group-action-v2.type';
 import {
   type CreateViewAction,
   type DeleteViewAction,
@@ -105,6 +112,15 @@ export type AllFlatEntityTypesByMetadataName = {
     flatEntity: FlatViewField;
     entity: ViewFieldEntity;
   };
+  viewGroup: {
+    actions: {
+      created: CreateViewGroupAction;
+      updated: UpdateViewGroupAction;
+      deleted: DeleteViewGroupAction;
+    };
+    flatEntity: FlatViewGroup;
+    entity: ViewGroupEntity;
+  };
   index: {
     actions: {
       created: CreateIndexAction;

packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/throw-on-field-input-transpilations-error.util.ts

@@ -2,6 +2,7 @@ import {
   type FieldInputTranspilationResult,
   type SuccessfulFieldInputTranspilation,
 } from 'src/engine/metadata-modules/flat-field-metadata/types/field-input-transpilation-result.type';
+import { EMPTY_ORCHESTRATOR_FAILURE_REPORT } from 'src/engine/workspace-manager/workspace-migration-v2/constant/empty-orchestrator-failure-report.constant';
 import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2';
 
 // This could be improved by still running the build and validate with available valid inputs
@@ -24,11 +25,7 @@ export const throwOnFieldInputTranspilationsError: ThrowOnFieldInputTranspilatio
       throw new WorkspaceMigrationBuilderExceptionV2(
         {
           report: {
-            viewFilter: [],
-            fieldMetadata: [],
-            index: [],
-            view: [],
-            viewField: [],
+            ...EMPTY_ORCHESTRATOR_FAILURE_REPORT,
             objectMetadata: [
               {
                 errors: failedInputTranspilationErrors,
@@ -36,10 +33,6 @@ export const throwOnFieldInputTranspilationsError: ThrowOnFieldInputTranspilatio
                 flatEntityMinimalInformation: {},
               },
             ],
-            serverlessFunction: [],
-            databaseEventTrigger: [],
-            cronTrigger: [],
-            routeTrigger: [],
           },
           status: 'fail',
         },

packages/twenty-server/src/engine/metadata-modules/flat-view-group/constants/flat-view-group-editable-properties.constant.ts

@@ -0,0 +1,8 @@
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+
+export const FLAT_VIEW_GROUP_EDITABLE_PROPERTIES = [
+  'isVisible',
+  'fieldValue',
+  'position',
+  'fieldMetadataId',
+] as const satisfies (keyof FlatViewGroup)[];

packages/twenty-server/src/engine/metadata-modules/flat-view-group/constants/view-group-entity-relation-properties.constant.ts

@@ -0,0 +1,7 @@
+import { type ViewGroupEntityRelationProperties } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+
+export const VIEW_GROUP_ENTITY_RELATION_PROPERTIES = [
+  'fieldMetadata',
+  'view',
+  'workspace',
+] as const satisfies ViewGroupEntityRelationProperties[];

packages/twenty-server/src/engine/metadata-modules/flat-view-group/services/workspace-flat-view-group-map-cache.service.ts

@@ -0,0 +1,50 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
+import { EMPTY_FLAT_ENTITY_MAPS } from 'src/engine/metadata-modules/flat-entity/constant/empty-flat-entity-maps.constant';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { FlatViewGroupMaps } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group-maps.type';
+import { fromViewGroupEntityToFlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/utils/from-view-group-entity-to-flat-view-group.util';
+import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
+import { WorkspaceFlatMapCache } from 'src/engine/workspace-flat-map-cache/decorators/workspace-flat-map-cache.decorator';
+import { WorkspaceFlatMapCacheService } from 'src/engine/workspace-flat-map-cache/services/workspace-flat-map-cache.service';
+
+@Injectable()
+@WorkspaceFlatMapCache('flatViewGroupMaps')
+export class WorkspaceFlatViewGroupMapCacheService extends WorkspaceFlatMapCacheService<FlatViewGroupMaps> {
+  constructor(
+    @InjectCacheStorage(CacheStorageNamespace.EngineWorkspace)
+    cacheStorageService: CacheStorageService,
+    @InjectRepository(ViewGroupEntity)
+    private readonly viewGroupRepository: Repository<ViewGroupEntity>,
+  ) {
+    super(cacheStorageService);
+  }
+
+  protected async computeFlatMap({
+    workspaceId,
+  }: {
+    workspaceId: string;
+  }): Promise<FlatViewGroupMaps> {
+    const existingViewGroups = await this.viewGroupRepository.find({
+      where: {
+        workspaceId,
+      },
+      withDeleted: true,
+    });
+
+    return existingViewGroups.reduce((flatViewGroupMaps, viewGroupEntity) => {
+      const flatViewGroup = fromViewGroupEntityToFlatViewGroup(viewGroupEntity);
+
+      return addFlatEntityToFlatEntityMapsOrThrow({
+        flatEntity: flatViewGroup,
+        flatEntityMaps: flatViewGroupMaps,
+      });
+    }, EMPTY_FLAT_ENTITY_MAPS);
+  }
+}

packages/twenty-server/src/engine/metadata-modules/flat-view-group/types/flat-view-group-maps.type.ts

@@ -0,0 +1,4 @@
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+
+export type FlatViewGroupMaps = FlatEntityMaps<FlatViewGroup>;

packages/twenty-server/src/engine/metadata-modules/flat-view-group/types/flat-view-group.type.ts

@@ -0,0 +1,18 @@
+import { type Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { type ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
+import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
+import { type ExtractRecordTypeOrmRelationProperties } from 'src/engine/workspace-manager/workspace-migration-v2/types/extract-record-typeorm-relation-properties.type';
+
+export type ViewGroupEntityRelationProperties =
+  ExtractRecordTypeOrmRelationProperties<
+    ViewGroupEntity,
+    FieldMetadataEntity | ViewEntity | Workspace
+  >;
+
+export type FlatViewGroup = Omit<
+  ViewGroupEntity,
+  ViewGroupEntityRelationProperties
+> & {
+  universalIdentifier: string;
+};

packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-create-view-group-input-to-flat-view-group-to-create.util.ts

@@ -0,0 +1,36 @@
+import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from 'twenty-shared/utils';
+import { v4 } from 'uuid';
+
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+import { type CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';
+
+export const fromCreateViewGroupInputToFlatViewGroupToCreate = ({
+  createViewGroupInput: rawCreateViewGroupInput,
+  workspaceId,
+}: {
+  createViewGroupInput: CreateViewGroupInput;
+  workspaceId: string;
+}): FlatViewGroup => {
+  const { fieldMetadataId, viewId, ...createViewGroupInput } =
+    trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties(
+      rawCreateViewGroupInput,
+      ['fieldMetadataId', 'fieldValue', 'id', 'viewId'],
+    );
+
+  const createdAt = new Date();
+  const viewGroupId = createViewGroupInput.id ?? v4();
+
+  return {
+    id: viewGroupId,
+    fieldMetadataId,
+    viewId,
+    workspaceId,
+    createdAt: createdAt,
+    updatedAt: createdAt,
+    deletedAt: null,
+    universalIdentifier: viewGroupId,
+    isVisible: createViewGroupInput.isVisible ?? true,
+    fieldValue: createViewGroupInput.fieldValue,
+    position: createViewGroupInput.position ?? 0,
+  };
+};

packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util.ts

@@ -0,0 +1,40 @@
+import { t } from '@lingui/core/macro';
+import {
+  extractAndSanitizeObjectStringFields,
+  isDefined,
+} from 'twenty-shared/utils';
+
+import { type FlatViewGroupMaps } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group-maps.type';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+import { type DeleteViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input';
+import {
+  ViewGroupException,
+  ViewGroupExceptionCode,
+} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';
+
+export const fromDeleteViewGroupInputToFlatViewGroupOrThrow = ({
+  deleteViewGroupInput: rawDeleteViewGroupInput,
+  flatViewGroupMaps,
+}: {
+  deleteViewGroupInput: DeleteViewGroupInput;
+  flatViewGroupMaps: FlatViewGroupMaps;
+}): FlatViewGroup => {
+  const { id: viewGroupId } = extractAndSanitizeObjectStringFields(
+    rawDeleteViewGroupInput,
+    ['id'],
+  );
+
+  const existingFlatViewGroupToDelete = flatViewGroupMaps.byId[viewGroupId];
+
+  if (!isDefined(existingFlatViewGroupToDelete)) {
+    throw new ViewGroupException(
+      t`View group to delete not found`,
+      ViewGroupExceptionCode.VIEW_GROUP_NOT_FOUND,
+    );
+  }
+
+  return {
+    ...existingFlatViewGroupToDelete,
+    deletedAt: new Date(),
+  };
+};

packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-destroy-view-group-input-to-flat-view-group-or-throw.util.ts

@@ -0,0 +1,37 @@
+import { t } from '@lingui/core/macro';
+import {
+  extractAndSanitizeObjectStringFields,
+  isDefined,
+} from 'twenty-shared/utils';
+
+import { type FlatViewGroupMaps } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group-maps.type';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+import { type DestroyViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/destroy-view-group.input';
+import {
+  ViewGroupException,
+  ViewGroupExceptionCode,
+} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';
+
+export const fromDestroyViewGroupInputToFlatViewGroupOrThrow = ({
+  destroyViewGroupInput,
+  flatViewGroupMaps,
+}: {
+  destroyViewGroupInput: DestroyViewGroupInput;
+  flatViewGroupMaps: FlatViewGroupMaps;
+}): FlatViewGroup => {
+  const { id: viewGroupId } = extractAndSanitizeObjectStringFields(
+    destroyViewGroupInput,
+    ['id'],
+  );
+
+  const existingFlatViewGroupToDestroy = flatViewGroupMaps.byId[viewGroupId];
+
+  if (!isDefined(existingFlatViewGroupToDestroy)) {
+    throw new ViewGroupException(
+      t`View group to destroy not found`,
+      ViewGroupExceptionCode.VIEW_GROUP_NOT_FOUND,
+    );
+  }
+
+  return existingFlatViewGroupToDestroy;
+};

packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-update-view-group-input-to-flat-view-group-to-update-or-throw.util.ts

@@ -0,0 +1,50 @@
+import { t } from '@lingui/core/macro';
+import {
+  extractAndSanitizeObjectStringFields,
+  isDefined,
+  trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties,
+} from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { FLAT_VIEW_GROUP_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-group/constants/flat-view-group-editable-properties.constant';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+import { type UpdateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/update-view-group.input';
+import {
+  ViewGroupException,
+  ViewGroupExceptionCode,
+} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';
+import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
+
+export const fromUpdateViewGroupInputToFlatViewGroupToUpdateOrThrow = ({
+  updateViewGroupInput: rawUpdateViewGroupInput,
+  flatViewGroupMaps,
+}: {
+  updateViewGroupInput: UpdateViewGroupInput;
+  flatViewGroupMaps: FlatEntityMaps<FlatViewGroup>;
+}): FlatViewGroup => {
+  const { id: viewGroupToUpdateId, update } =
+    trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties(
+      rawUpdateViewGroupInput,
+      ['id'],
+    );
+
+  const existingFlatViewGroupToUpdate =
+    flatViewGroupMaps.byId[viewGroupToUpdateId];
+
+  if (!isDefined(existingFlatViewGroupToUpdate)) {
+    throw new ViewGroupException(
+      t`View group to update not found`,
+      ViewGroupExceptionCode.VIEW_GROUP_NOT_FOUND,
+    );
+  }
+  const updatedEditableGroupProperties = extractAndSanitizeObjectStringFields(
+    update,
+    FLAT_VIEW_GROUP_EDITABLE_PROPERTIES,
+  );
+
+  return mergeUpdateInExistingRecord({
+    existing: existingFlatViewGroupToUpdate,
+    properties: FLAT_VIEW_GROUP_EDITABLE_PROPERTIES,
+    update: updatedEditableGroupProperties,
+  });
+};

packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-view-group-entity-to-flat-view-group.util.ts

@@ -0,0 +1,21 @@
+import { removePropertiesFromRecord } from 'twenty-shared/utils';
+
+import { VIEW_GROUP_ENTITY_RELATION_PROPERTIES } from 'src/engine/metadata-modules/flat-view-group/constants/view-group-entity-relation-properties.constant';
+import { type FlatViewGroup } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group.type';
+import { type ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
+
+export const fromViewGroupEntityToFlatViewGroup = (
+  viewGroupEntity: ViewGroupEntity,
+): FlatViewGroup => {
+  const viewGroupEntityWithoutRelations = removePropertiesFromRecord(
+    viewGroupEntity,
+    VIEW_GROUP_ENTITY_RELATION_PROPERTIES,
+  );
+
+  return {
+    ...viewGroupEntityWithoutRelations,
+    universalIdentifier:
+      viewGroupEntityWithoutRelations.universalIdentifier ??
+      viewGroupEntityWithoutRelations.id,
+  };
+};

packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts

@@ -43,7 +43,7 @@ export class WorkspaceFlatViewMapCacheService extends WorkspaceFlatMapCacheServi
           id: true,
         },
       },
-      relations: ['viewFields', 'viewFilters'],
+      relations: ['viewFields', 'viewFilters', 'viewGroups'],
       withDeleted: true,
     });
 

packages/twenty-server/src/engine/metadata-modules/flat-view/types/flat-view.type.ts

@@ -24,4 +24,5 @@ export type FlatView = Omit<ViewEntity, ViewEntityRelationProperties> & {
   universalIdentifier: string;
   viewFieldIds: string[];
   viewFilterIds: string[];
+  viewGroupIds: string[];
 };

packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.ts

@@ -45,5 +45,6 @@ export const fromCreateViewInputToFlatViewToCreate = ({
     universalIdentifier: v4(),
     viewFieldIds: [],
     viewFilterIds: [],
+    viewGroupIds: [],
   };
 };

packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util.ts

@@ -17,5 +17,6 @@ export const fromViewEntityToFlatView = (viewEntity: ViewEntity): FlatView => {
       viewEntityWithoutRelations.id,
     viewFieldIds: viewEntity.viewFields.map((viewField) => viewField.id),
     viewFilterIds: viewEntity.viewFilters.map((viewFilter) => viewFilter.id),
+    viewGroupIds: viewEntity.viewGroups.map((viewGroup) => viewGroup.id),
   };
 };

packages/twenty-server/src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input.ts

@@ -1,24 +1,41 @@
 import { Field, InputType } from '@nestjs/graphql';
 
+import {
+  IsBoolean,
+  IsNumber,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from 'class-validator';
+
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 
 @InputType()
 export class CreateViewGroupInput {
+  @IsOptional()
+  @IsUUID()
   @Field(() => UUIDScalarType, { nullable: true })
   id?: string;
 
+  @IsUUID()
   @Field(() => UUIDScalarType, { nullable: false })
   fieldMetadataId: string;
 
+  @IsOptional()
+  @IsBoolean()
   @Field({ nullable: true, defaultValue: true })
   isVisible?: boolean;
 
+  @IsString()
   @Field({ nullable: false })
   fieldValue: string;
 
+  @IsOptional()
+  @IsNumber()
   @Field({ nullable: true, defaultValue: 0 })
   position?: number;
 
+  @IsUUID()
   @Field(() => UUIDScalarType, { nullable: false })
   viewId: string;
 }

packages/twenty-server/src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input.ts

@@ -0,0 +1,15 @@
+import { InputType } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+import { IsUUID } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@InputType()
+export class DeleteViewGroupInput {
+  @IDField(() => UUIDScalarType, {
+    description: 'The id of the view group to delete.',
+  })
+  @IsUUID()
+  id: string;
+}

packages/twenty-server/src/engine/metadata-modules/view-group/dtos/inputs/destroy-view-group.input.ts

@@ -0,0 +1,15 @@
+import { InputType } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+import { IsUUID } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@InputType()
+export class DestroyViewGroupInput {
+  @IDField(() => UUIDScalarType, {
+    description: 'The id of the view group to destroy.',
+  })
+  @IsUUID()
+  id: string;
+}

packages/twenty-server/src/engine/metadata-modules/view-group/dtos/inputs/update-view-group.input.ts

@@ -1,6 +1,54 @@
-import { InputType, PartialType } from '@nestjs/graphql';
+import { Field, InputType } from '@nestjs/graphql';
 
-import { CreateViewGroupInput } from './create-view-group.input';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+  IsUUID,
+  ValidateNested,
+} from 'class-validator';
+import { Type } from 'class-transformer';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 
 @InputType()
-export class UpdateViewGroupInput extends PartialType(CreateViewGroupInput) {}
+class UpdateViewGroupInputUpdates {
+  @IsOptional()
+  @IsUUID()
+  @Field(() => UUIDScalarType, { nullable: true })
+  fieldMetadataId?: string;
+
+  @IsOptional()
+  @IsBoolean()
+  @Field({ nullable: true })
+  isVisible?: boolean;
+
+  @IsOptional()
+  @IsString()
+  @Field({ nullable: true })
+  fieldValue?: string;
+
+  @IsOptional()
+  @IsNumber()
+  @Field({ nullable: true })
+  position?: number;
+}
+
+@InputType()
+export class UpdateViewGroupInput {
+  @IsUUID()
+  @IsNotEmpty()
+  @Field(() => UUIDScalarType, {
+    description: 'The id of the view group to update',
+  })
+  id: string;
+
+  @Type(() => UpdateViewGroupInputUpdates)
+  @ValidateNested()
+  @Field(() => UpdateViewGroupInputUpdates, {
+    description: 'The view group to update',
+  })
+  update: UpdateViewGroupInputUpdates;
+}

packages/twenty-server/src/engine/metadata-modules/view-group/entities/view-group.entity.ts

@@ -57,7 +57,7 @@ export class ViewGroupEntity extends SyncableEntity {
   updatedAt: Date;
 
   @DeleteDateColumn({ type: 'timestamptz' })
-  deletedAt?: Date | null;
+  deletedAt: Date | null;
 
   @ManyToOne(() => Workspace, {
     onDelete: 'CASCADE',

packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts

@@ -1,14 +1,17 @@
 import { UseFilters, UseGuards } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 
-import { isDefined } from 'twenty-shared/utils';
-
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';
+import { DeleteViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input';
+import { DestroyViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/destroy-view-group.input';
 import { UpdateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/update-view-group.input';
 import { ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';
+import { ViewGroupV2Service } from 'src/engine/metadata-modules/view-group/services/view-group-v2.service';
 import { ViewGroupService } from 'src/engine/metadata-modules/view-group/services/view-group.service';
 import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
 
@@ -16,7 +19,11 @@ import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/
 @UseFilters(ViewGraphqlApiExceptionFilter)
 @UseGuards(WorkspaceAuthGuard)
 export class ViewGroupResolver {
-  constructor(private readonly viewGroupService: ViewGroupService) {}
+  constructor(
+    private readonly viewGroupService: ViewGroupService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly viewGroupV2Service: ViewGroupV2Service,
+  ) {}
 
   @Query(() => [ViewGroupDTO])
   async getCoreViewGroups(
@@ -41,47 +48,104 @@ export class ViewGroupResolver {
 
   @Mutation(() => ViewGroupDTO)
   async createCoreViewGroup(
-    @Args('input') input: CreateViewGroupInput,
-    @AuthWorkspace() workspace: Workspace,
+    @Args('input') createViewGroupInput: CreateViewGroupInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
   ): Promise<ViewGroupDTO> {
+    const isWorkspaceMigrationV2Enabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IS_WORKSPACE_MIGRATION_V2_ENABLED,
+        workspaceId,
+      );
+
+    if (isWorkspaceMigrationV2Enabled) {
+      return await this.viewGroupV2Service.createOne({
+        createViewGroupInput,
+        workspaceId,
+      });
+    }
+
     return this.viewGroupService.create({
-      ...input,
-      workspaceId: workspace.id,
+      ...createViewGroupInput,
+      workspaceId,
     });
   }
 
   @Mutation(() => ViewGroupDTO)
   async updateCoreViewGroup(
-    @Args('id', { type: () => String }) id: string,
-    @Args('input') input: UpdateViewGroupInput,
-    @AuthWorkspace() workspace: Workspace,
+    @Args('input') updateViewGroupInput: UpdateViewGroupInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
   ): Promise<ViewGroupDTO> {
-    return this.viewGroupService.update(id, workspace.id, input);
+    const isWorkspaceMigrationV2Enabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IS_WORKSPACE_MIGRATION_V2_ENABLED,
+        workspaceId,
+      );
+
+    if (isWorkspaceMigrationV2Enabled) {
+      return await this.viewGroupV2Service.updateOne({
+        updateViewGroupInput,
+        workspaceId,
+      });
+    }
+
+    return this.viewGroupService.update(
+      updateViewGroupInput.id,
+      workspaceId,
+      updateViewGroupInput.update,
+    );
   }
 
-  @Mutation(() => Boolean)
+  @Mutation(() => ViewGroupDTO)
   async deleteCoreViewGroup(
-    @Args('id', { type: () => String }) id: string,
-    @AuthWorkspace() workspace: Workspace,
-  ): Promise<boolean> {
+    @Args('input') deleteViewGroupInput: DeleteViewGroupInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ): Promise<ViewGroupDTO> {
+    const isWorkspaceMigrationV2Enabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IS_WORKSPACE_MIGRATION_V2_ENABLED,
+        workspaceId,
+      );
+
+    if (isWorkspaceMigrationV2Enabled) {
+      return await this.viewGroupV2Service.deleteOne({
+        deleteViewGroupInput,
+        workspaceId,
+      });
+    }
+
     const deletedViewGroup = await this.viewGroupService.delete(
-      id,
-      workspace.id,
+      deleteViewGroupInput.id,
+      workspaceId,
     );
 
-    return isDefined(deletedViewGroup);
+    return deletedViewGroup;
   }
 
-  @Mutation(() => Boolean)
+  @Mutation(() => ViewGroupDTO)
   async destroyCoreViewGroup(
-    @Args('id', { type: () => String }) id: string,
-    @AuthWorkspace() workspace: Workspace,
-  ): Promise<boolean> {
-    const deletedViewGroup = await this.viewGroupService.destroy(
-      id,
-      workspace.id,
+    @Args('input') destroyViewGroupInput: DestroyViewGroupInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ): Promise<ViewGroupDTO> {
+    const isWorkspaceMigrationV2Enabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IS_WORKSPACE_MIGRATION_V2_ENABLED,
+        workspaceId,
+      );
+
+    if (isWorkspaceMigrationV2Enabled) {
+      const destroyedViewGroup = await this.viewGroupV2Service.destroyOne({
+        destroyViewGroupInput,
+        workspaceId,
+      });
+
+      return destroyedViewGroup;
+    }
+
+    const destroyedViewGroup = await this.viewGroupService.destroy(
+      destroyViewGroupInput.id,
+      workspaceId,
     );
 
-    return isDefined(deletedViewGroup);
+    return destroyedViewGroup;
   }
 }

packages/twenty-server/src/engine/metadata-modules/view-group/services/tests/view-group.service.spec.ts

@@ -315,7 +315,7 @@ describe('ViewGroupService', () => {
 
       expect(viewGroupService.findById).toHaveBeenCalledWith(id, workspaceId);
       expect(viewGroupRepository.delete).toHaveBeenCalledWith(id);
-      expect(result).toEqual(true);
+      expect(result).toEqual(mockViewGroup);
     });
   });
 });

packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group-v2.service.ts

@@ -0,0 +1,323 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { EMPTY_FLAT_ENTITY_MAPS } from 'src/engine/metadata-modules/flat-entity/constant/empty-flat-entity-maps.constant';
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { deleteFlatEntityFromFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/delete-flat-entity-from-flat-entity-maps-or-throw.util';
+import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
+import { getSubFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/get-sub-flat-entity-maps-or-throw.util';
+import { replaceFlatEntityInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/replace-flat-entity-in-flat-entity-maps-or-throw.util';
+import { fromCreateViewGroupInputToFlatViewGroupToCreate } from 'src/engine/metadata-modules/flat-view-group/utils/from-create-view-group-input-to-flat-view-group-to-create.util';
+import { fromDeleteViewGroupInputToFlatViewGroupOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util';
+import { fromDestroyViewGroupInputToFlatViewGroupOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-destroy-view-group-input-to-flat-view-group-or-throw.util';
+import { fromUpdateViewGroupInputToFlatViewGroupToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-update-view-group-input-to-flat-view-group-to-update-or-throw.util';
+import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';
+import { DeleteViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input';
+import { DestroyViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/destroy-view-group.input';
+import { UpdateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/update-view-group.input';
+import { ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';
+import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service';
+
+@Injectable()
+export class ViewGroupV2Service {
+  constructor(
+    private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+    private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+  ) {}
+
+  async createOne({
+    createViewGroupInput,
+    workspaceId,
+  }: {
+    createViewGroupInput: CreateViewGroupInput;
+    workspaceId: string;
+  }): Promise<ViewGroupDTO> {
+    const {
+      flatViewGroupMaps: existingFlatViewGroupMaps,
+      flatViewMaps,
+      flatFieldMetadataMaps,
+    } = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+      {
+        workspaceId,
+        flatMapsKeys: [
+          'flatViewGroupMaps',
+          'flatViewMaps',
+          'flatFieldMetadataMaps',
+        ],
+      },
+    );
+
+    const flatViewGroupToCreate =
+      fromCreateViewGroupInputToFlatViewGroupToCreate({
+        createViewGroupInput,
+        workspaceId,
+      });
+
+    const toFlatViewGroupMaps = addFlatEntityToFlatEntityMapsOrThrow({
+      flatEntity: flatViewGroupToCreate,
+      flatEntityMaps: existingFlatViewGroupMaps,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          fromToAllFlatEntityMaps: {
+            flatViewGroupMaps: {
+              from: existingFlatViewGroupMaps,
+              to: toFlatViewGroupMaps,
+            },
+          },
+          dependencyAllFlatEntityMaps: {
+            flatFieldMetadataMaps,
+            flatViewMaps,
+          },
+          buildOptions: {
+            isSystemBuild: false,
+            inferDeletionFromMissingEntities: false,
+          },
+          workspaceId,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while creating view group',
+      );
+    }
+
+    const { flatViewGroupMaps: recomputedExistingFlatViewGroupMaps } =
+      await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatViewGroupMaps'],
+        },
+      );
+
+    return findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: flatViewGroupToCreate.id,
+      flatEntityMaps: recomputedExistingFlatViewGroupMaps,
+    });
+  }
+
+  async updateOne({
+    updateViewGroupInput,
+    workspaceId,
+  }: {
+    workspaceId: string;
+    updateViewGroupInput: UpdateViewGroupInput;
+  }): Promise<ViewGroupDTO> {
+    const {
+      flatViewGroupMaps: existingFlatViewGroupMaps,
+      flatViewMaps,
+      flatFieldMetadataMaps,
+    } = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+      {
+        workspaceId,
+        flatMapsKeys: [
+          'flatViewGroupMaps',
+          'flatViewMaps',
+          'flatFieldMetadataMaps',
+        ],
+      },
+    );
+
+    const optimisticallyUpdatedFlatViewGroup =
+      fromUpdateViewGroupInputToFlatViewGroupToUpdateOrThrow({
+        flatViewGroupMaps: existingFlatViewGroupMaps,
+        updateViewGroupInput,
+      });
+
+    const toFlatViewGroupMaps = addFlatEntityToFlatEntityMapsOrThrow({
+      flatEntity: optimisticallyUpdatedFlatViewGroup,
+      flatEntityMaps: EMPTY_FLAT_ENTITY_MAPS,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          fromToAllFlatEntityMaps: {
+            flatViewGroupMaps: {
+              from: existingFlatViewGroupMaps,
+              to: toFlatViewGroupMaps,
+            },
+          },
+          dependencyAllFlatEntityMaps: {
+            flatViewMaps,
+            flatFieldMetadataMaps,
+          },
+          buildOptions: {
+            isSystemBuild: false,
+            inferDeletionFromMissingEntities: false,
+          },
+          workspaceId,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while updating view group',
+      );
+    }
+
+    const { flatViewGroupMaps: recomputedExistingFlatViewGroupMaps } =
+      await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatViewGroupMaps'],
+        },
+      );
+
+    return findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: optimisticallyUpdatedFlatViewGroup.id,
+      flatEntityMaps: recomputedExistingFlatViewGroupMaps,
+    });
+  }
+
+  async deleteOne({
+    deleteViewGroupInput,
+    workspaceId,
+  }: {
+    deleteViewGroupInput: DeleteViewGroupInput;
+    workspaceId: string;
+  }): Promise<ViewGroupDTO> {
+    const {
+      flatViewGroupMaps: existingFlatViewGroupMaps,
+      flatViewMaps,
+      flatFieldMetadataMaps,
+    } = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+      {
+        workspaceId,
+        flatMapsKeys: [
+          'flatViewGroupMaps',
+          'flatViewMaps',
+          'flatFieldMetadataMaps',
+        ],
+      },
+    );
+
+    const optimisticallyUpdatedFlatViewGroupWithDeletedAt =
+      fromDeleteViewGroupInputToFlatViewGroupOrThrow({
+        flatViewGroupMaps: existingFlatViewGroupMaps,
+        deleteViewGroupInput,
+      });
+
+    const toFlatViewGroupMaps = replaceFlatEntityInFlatEntityMapsOrThrow({
+      flatEntity: optimisticallyUpdatedFlatViewGroupWithDeletedAt,
+      flatEntityMaps: existingFlatViewGroupMaps,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          fromToAllFlatEntityMaps: {
+            flatViewGroupMaps: {
+              from: existingFlatViewGroupMaps,
+              to: toFlatViewGroupMaps,
+            },
+          },
+          dependencyAllFlatEntityMaps: {
+            flatFieldMetadataMaps,
+            flatViewMaps,
+          },
+          buildOptions: {
+            isSystemBuild: false,
+            inferDeletionFromMissingEntities: false,
+          },
+          workspaceId,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while deleting view group',
+      );
+    }
+
+    const { flatViewGroupMaps: recomputedExistingFlatViewGroupMaps } =
+      await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatViewGroupMaps'],
+        },
+      );
+
+    return findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: optimisticallyUpdatedFlatViewGroupWithDeletedAt.id,
+      flatEntityMaps: recomputedExistingFlatViewGroupMaps,
+    });
+  }
+
+  async destroyOne({
+    destroyViewGroupInput,
+    workspaceId,
+  }: {
+    destroyViewGroupInput: DestroyViewGroupInput;
+    workspaceId: string;
+  }): Promise<ViewGroupDTO> {
+    const {
+      flatViewGroupMaps: existingFlatViewGroupMaps,
+      flatViewMaps: existingFlatViewMaps,
+      flatFieldMetadataMaps: existingFlatFieldMetadataMaps,
+    } = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+      {
+        workspaceId,
+        flatMapsKeys: [
+          'flatViewGroupMaps',
+          'flatViewMaps',
+          'flatFieldMetadataMaps',
+        ],
+      },
+    );
+
+    const existingViewGroupToDelete =
+      fromDestroyViewGroupInputToFlatViewGroupOrThrow({
+        destroyViewGroupInput,
+        flatViewGroupMaps: existingFlatViewGroupMaps,
+      });
+
+    const fromFlatViewGroupMaps = getSubFlatEntityMapsOrThrow({
+      flatEntityIds: [existingViewGroupToDelete.id],
+      flatEntityMaps: existingFlatViewGroupMaps,
+    });
+    const toFlatViewGroupMaps = deleteFlatEntityFromFlatEntityMapsOrThrow({
+      flatEntityMaps: fromFlatViewGroupMaps,
+      entityToDeleteId: existingViewGroupToDelete.id,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          fromToAllFlatEntityMaps: {
+            flatViewGroupMaps: {
+              from: fromFlatViewGroupMaps,
+              to: toFlatViewGroupMaps,
+            },
+          },
+          dependencyAllFlatEntityMaps: {
+            flatViewMaps: existingFlatViewMaps,
+            flatFieldMetadataMaps: existingFlatFieldMetadataMaps,
+          },
+          buildOptions: {
+            isSystemBuild: false,
+            inferDeletionFromMissingEntities: true,
+          },
+          workspaceId,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while destroying view group',
+      );
+    }
+
+    return existingViewGroupToDelete;
+  }
+}

packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts

@@ -168,7 +168,7 @@ export class ViewGroupService {
     return viewGroup;
   }
 
-  async destroy(id: string, workspaceId: string): Promise<boolean> {
+  async destroy(id: string, workspaceId: string): Promise<ViewGroupEntity> {
     const viewGroup = await this.findById(id, workspaceId);
 
     if (!isDefined(viewGroup)) {
@@ -185,7 +185,7 @@ export class ViewGroupService {
 
     await this.flushGraphQLCache(workspaceId);
 
-    return true;
+    return viewGroup;
   }
 
   private async flushGraphQLCache(workspaceId: string): Promise<void> {

packages/twenty-server/src/engine/metadata-modules/view-group/view-group.module.ts

@@ -1,19 +1,26 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
 import { ViewGroupController } from 'src/engine/metadata-modules/view-group/controllers/view-group.controller';
 import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
 import { ViewGroupResolver } from 'src/engine/metadata-modules/view-group/resolvers/view-group.resolver';
+import { ViewGroupV2Service } from 'src/engine/metadata-modules/view-group/services/view-group-v2.service';
 import { ViewGroupService } from 'src/engine/metadata-modules/view-group/services/view-group.service';
 import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
+import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([ViewGroupEntity]),
     WorkspaceCacheStorageModule,
+    FeatureFlagModule,
+    WorkspaceMigrationV2Module,
+    WorkspaceManyOrAllFlatEntityMapsCacheModule,
   ],
   controllers: [ViewGroupController],
-  providers: [ViewGroupService, ViewGroupResolver],
+  providers: [ViewGroupService, ViewGroupV2Service, ViewGroupResolver],
   exports: [ViewGroupService],
 })
 export class ViewGroupModule {}