Introducing view field group syncable entity (#17867)

## Context Introduces a new viewFieldGroup entity that allows grouping view fields into sections (e.g. "General", "Additional", "Other") within a view. The page layout fields widget needs a way to organize fields into sections. Today, views have no concept of field grouping. This PR introduces the viewFieldGroup entity which sits between a view and its viewFields, enabling section-based organization. <img width="401" height="724" alt="Layout - V2 (customize visibility)" src="https://github.com/user-attachments/assets/6376e2ab-44db-42bf-9d2c-758f56f6b548" /> --------- Co-authored-by: Charles Bochet <charles@twenty.com>
2026-02-11 22:02:58 +01:00
parent ed66fbd71b
commit 6aca1dd013
126 changed files with 3593 additions and 115 deletions
@@ -143,6 +143,7 @@ export const enrichCreateWorkspaceMigrationActionsWithIds = ({
      case 'view':
      case 'viewField':
      case 'viewGroup':
+      case 'viewFieldGroup':
      case 'rowLevelPermissionPredicate':
      case 'rowLevelPermissionPredicateGroup':
      case 'viewFilterGroup':
@@ -31,6 +31,7 @@ import { WorkspaceMigrationRowLevelPermissionPredicateGroupActionsBuilderService
 import { WorkspaceMigrationRowLevelPermissionPredicateActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/row-level-permission-predicate/workspace-migration-row-level-permission-predicate-actions-builder.service';
 import { WorkspaceMigrationSkillActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/skill/workspace-migration-skill-actions-builder.service';
 import { WorkspaceMigrationViewFieldActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field/workspace-migration-view-field-actions-builder.service';
+import { WorkspaceMigrationViewFieldGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/workspace-migration-view-field-group-actions-builder.service';
 import { WorkspaceMigrationViewFilterGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-filter-group/workspace-migration-view-filter-group-actions-builder.service';
 import { WorkspaceMigrationViewFilterActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-filter/workspace-migration-view-filter-actions-builder.service';
 import { WorkspaceMigrationViewGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-group/workspace-migration-view-group-actions-builder.service';
@@ -47,6 +48,7 @@ export class WorkspaceMigrationBuildOrchestratorService {
    private readonly workspaceMigrationViewFilterActionsBuilderService: WorkspaceMigrationViewFilterActionsBuilderService,
    private readonly workspaceMigrationViewFilterGroupActionsBuilderService: WorkspaceMigrationViewFilterGroupActionsBuilderService,
    private readonly workspaceMigrationViewGroupActionsBuilderService: WorkspaceMigrationViewGroupActionsBuilderService,
+    private readonly workspaceMigrationViewFieldGroupActionsBuilderService: WorkspaceMigrationViewFieldGroupActionsBuilderService,
    private readonly workspaceMigrationLogicFunctionActionsBuilderService: WorkspaceMigrationLogicFunctionActionsBuilderService,
    private readonly workspaceMigrationRoleTargetActionsBuilderService: WorkspaceMigrationRoleTargetActionsBuilderService,
    private readonly workspaceMigrationFieldActionsBuilderService: WorkspaceMigrationFieldActionsBuilderService,
@@ -150,6 +152,7 @@ export class WorkspaceMigrationBuildOrchestratorService {
      flatViewFilterMaps,
      flatViewFilterGroupMaps,
      flatViewGroupMaps,
+      flatViewFieldGroupMaps,
      flatRowLevelPermissionPredicateMaps,
      flatRowLevelPermissionPredicateGroupMaps,
      flatRoleMaps,
@@ -324,6 +327,8 @@ export class WorkspaceMigrationBuildOrchestratorService {
              flatFieldMetadataMaps:
                optimisticAllFlatEntityMaps.flatFieldMetadataMaps,
              flatViewMaps: optimisticAllFlatEntityMaps.flatViewMaps,
+              flatViewFieldGroupMaps:
+                optimisticAllFlatEntityMaps.flatViewFieldGroupMaps,
            },
            workspaceId,
          },
@@ -452,6 +457,41 @@ export class WorkspaceMigrationBuildOrchestratorService {
      }
    }

+    if (isDefined(flatViewFieldGroupMaps)) {
+      const { from: fromFlatViewFieldGroupMaps, to: toFlatViewFieldGroupMaps } =
+        flatViewFieldGroupMaps;
+
+      const viewFieldGroupResult =
+        await this.workspaceMigrationViewFieldGroupActionsBuilderService.validateAndBuild(
+          {
+            additionalCacheDataMaps,
+            from: fromFlatViewFieldGroupMaps,
+            to: toFlatViewFieldGroupMaps,
+            buildOptions,
+            dependencyOptimisticFlatEntityMaps: {
+              flatViewMaps: optimisticAllFlatEntityMaps.flatViewMaps,
+            },
+            workspaceId,
+          },
+        );
+
+      this.mergeFlatEntityMapsAndRelatedFlatEntityMapsInAllFlatEntityMapsThroughMutation(
+        {
+          allFlatEntityMaps: optimisticAllFlatEntityMaps,
+          flatEntityMapsAndRelatedFlatEntityMaps:
+            viewFieldGroupResult.optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+        },
+      );
+
+      if (viewFieldGroupResult.status === 'fail') {
+        orchestratorFailureReport.viewFieldGroup.push(
+          ...viewFieldGroupResult.errors,
+        );
+      } else {
+        orchestratorActionsReport.viewFieldGroup = viewFieldGroupResult.actions;
+      }
+    }
+
    if (isDefined(flatRowLevelPermissionPredicateGroupMaps)) {
      const {
        from: fromFlatRowLevelPermissionPredicateGroupMaps,
@@ -1003,6 +1043,9 @@ export class WorkspaceMigrationBuildOrchestratorService {
          ...aggregatedOrchestratorActionsReport.viewGroup.delete,
          ...aggregatedOrchestratorActionsReport.viewGroup.create,
          ...aggregatedOrchestratorActionsReport.viewGroup.update,
+          ...aggregatedOrchestratorActionsReport.viewFieldGroup.delete,
+          ...aggregatedOrchestratorActionsReport.viewFieldGroup.create,
+          ...aggregatedOrchestratorActionsReport.viewFieldGroup.update,
          ///

          // Logic functions
@@ -15,6 +15,7 @@ export const ALL_JSONB_PROPERTIES_WITH_SERIALIZED_RELATION_BY_METADATA_NAME = {
  view: {},
  viewField: {},
  viewGroup: {},
+  viewFieldGroup: {},
  viewFilter: {},
  viewFilterGroup: {},
  index: {},
@@ -202,6 +202,7 @@ export const ALL_UNIVERSAL_METADATA_RELATIONS = {
      viewFilters: { metadataName: 'viewFilter' },
      viewFilterGroups: { metadataName: 'viewFilterGroup' },
      viewGroups: { metadataName: 'viewGroup' },
+      viewFieldGroups: { metadataName: 'viewFieldGroup' },
      // TODO migrate viewSort to v2
      viewSorts: null,
    },
@@ -224,11 +225,36 @@ export const ALL_UNIVERSAL_METADATA_RELATIONS = {
        universalForeignKey: 'viewUniversalIdentifier',
        isNullable: false,
      },
+      viewFieldGroup: {
+        metadataName: 'viewFieldGroup',
+        foreignKey: 'viewFieldGroupId',
+        universalFlatEntityForeignKeyAggregator:
+          'viewFieldUniversalIdentifiers',
+        universalForeignKey: 'viewFieldGroupUniversalIdentifier',
+        isNullable: true,
+      },
      workspace: null,
      application: null,
    },
    oneToMany: {},
  },
+  viewFieldGroup: {
+    manyToOne: {
+      view: {
+        metadataName: 'view',
+        foreignKey: 'viewId',
+        universalFlatEntityForeignKeyAggregator:
+          'viewFieldGroupUniversalIdentifiers',
+        universalForeignKey: 'viewUniversalIdentifier',
+        isNullable: false,
+      },
+      workspace: null,
+      application: null,
+    },
+    oneToMany: {
+      viewFields: { metadataName: 'viewField' },
+    },
+  },
  viewFilter: {
    manyToOne: {
      fieldMetadata: {
@@ -0,0 +1,7 @@
+import { type ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
+import { type UniversalFlatEntityFrom } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-from.type';
+
+export type UniversalFlatViewFieldGroup = UniversalFlatEntityFrom<
+  ViewFieldGroupEntity,
+  'viewFieldGroup'
+>;
@@ -0,0 +1,24 @@
+import { type BaseFlatCreateWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-flat-create-workspace-migration-action.type';
+import { type BaseFlatDeleteWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-flat-delete-workspace-migration-action.type';
+import { type BaseFlatUpdateWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-flat-update-workspace-migration-action.type';
+import { type BaseUniversalCreateWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-universal-create-workspace-migration-action.type';
+import { type BaseUniversalDeleteWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-universal-delete-workspace-migration-action.type';
+import { type BaseUniversalUpdateWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/base-universal-update-workspace-migration-action.type';
+
+export type UniversalCreateViewFieldGroupAction =
+  BaseUniversalCreateWorkspaceMigrationAction<'viewFieldGroup'>;
+
+export type FlatCreateViewFieldGroupAction =
+  BaseFlatCreateWorkspaceMigrationAction<'viewFieldGroup'>;
+
+export type FlatUpdateViewFieldGroupAction =
+  BaseFlatUpdateWorkspaceMigrationAction<'viewFieldGroup'>;
+
+export type UniversalUpdateViewFieldGroupAction =
+  BaseUniversalUpdateWorkspaceMigrationAction<'viewFieldGroup'>;
+
+export type UniversalDeleteViewFieldGroupAction =
+  BaseUniversalDeleteWorkspaceMigrationAction<'viewFieldGroup'>;
+
+export type FlatDeleteViewFieldGroupAction =
+  BaseFlatDeleteWorkspaceMigrationAction<'viewFieldGroup'>;
@@ -0,0 +1,116 @@
+import { Injectable } from '@nestjs/common';
+
+import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
+
+import { UniversalUpdateViewFieldGroupAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/types/workspace-migration-view-field-group-action.type';
+import { WorkspaceEntityMigrationBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service';
+import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
+import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { UniversalFlatEntityValidationReturnType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-result.type';
+import { FlatViewFieldGroupValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-field-group-validator.service';
+
+@Injectable()
+export class WorkspaceMigrationViewFieldGroupActionsBuilderService extends WorkspaceEntityMigrationBuilderService<
+  typeof ALL_METADATA_NAME.viewFieldGroup
+> {
+  constructor(
+    private readonly flatViewFieldGroupValidatorService: FlatViewFieldGroupValidatorService,
+  ) {
+    super(ALL_METADATA_NAME.viewFieldGroup);
+  }
+
+  protected validateFlatEntityCreation(
+    args: UniversalFlatEntityValidationArgs<
+      typeof ALL_METADATA_NAME.viewFieldGroup
+    >,
+  ): UniversalFlatEntityValidationReturnType<
+    typeof ALL_METADATA_NAME.viewFieldGroup,
+    'create'
+  > {
+    const validationResult =
+      this.flatViewFieldGroupValidatorService.validateFlatViewFieldGroupCreation(
+        args,
+      );
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    return {
+      status: 'success',
+      action: {
+        type: 'create',
+        metadataName: 'viewFieldGroup',
+        flatEntity: args.flatEntityToValidate,
+      },
+    };
+  }
+
+  protected validateFlatEntityDeletion(
+    args: UniversalFlatEntityValidationArgs<
+      typeof ALL_METADATA_NAME.viewFieldGroup
+    >,
+  ): UniversalFlatEntityValidationReturnType<
+    typeof ALL_METADATA_NAME.viewFieldGroup,
+    'delete'
+  > {
+    const validationResult =
+      this.flatViewFieldGroupValidatorService.validateFlatViewFieldGroupDeletion(
+        args,
+      );
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    return {
+      status: 'success',
+      action: {
+        type: 'delete',
+        metadataName: 'viewFieldGroup',
+        universalIdentifier: args.flatEntityToValidate.universalIdentifier,
+      },
+    };
+  }
+
+  protected validateFlatEntityUpdate(
+    args: FlatEntityUpdateValidationArgs<
+      typeof ALL_METADATA_NAME.viewFieldGroup
+    >,
+  ): UniversalFlatEntityValidationReturnType<
+    typeof ALL_METADATA_NAME.viewFieldGroup,
+    'update'
+  > {
+    const validationResult =
+      this.flatViewFieldGroupValidatorService.validateFlatViewFieldGroupUpdate(
+        args,
+      );
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    const { universalIdentifier, flatEntityUpdate } = args;
+
+    const updateAction: UniversalUpdateViewFieldGroupAction = {
+      type: 'update',
+      metadataName: 'viewFieldGroup',
+      universalIdentifier,
+      update: flatEntityUpdate,
+    };
+
+    return {
+      status: 'success',
+      action: updateAction,
+    };
+  }
+}
@@ -0,0 +1,143 @@
+import { Injectable } from '@nestjs/common';
+
+import { msg, t } from '@lingui/core/macro';
+import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { ViewExceptionCode } from 'src/engine/metadata-modules/view/exceptions/view.exception';
+import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
+import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
+import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
+import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+
+@Injectable()
+export class FlatViewFieldGroupValidatorService {
+  public validateFlatViewFieldGroupCreation({
+    flatEntityToValidate: flatViewFieldGroupToValidate,
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatViewFieldGroupMaps: optimisticFlatViewFieldGroupMaps,
+      flatViewMaps,
+    },
+  }: UniversalFlatEntityValidationArgs<
+    typeof ALL_METADATA_NAME.viewFieldGroup
+  >): FailedFlatEntityValidation<'viewFieldGroup', 'create'> {
+    const validationResult = getEmptyFlatEntityValidationError({
+      flatEntityMinimalInformation: {
+        universalIdentifier: flatViewFieldGroupToValidate.universalIdentifier,
+        viewUniversalIdentifier:
+          flatViewFieldGroupToValidate.viewUniversalIdentifier,
+      },
+      metadataName: 'viewFieldGroup',
+      type: 'create',
+    });
+
+    const existingFlatViewFieldGroup = findFlatEntityByUniversalIdentifier({
+      universalIdentifier: flatViewFieldGroupToValidate.universalIdentifier,
+      flatEntityMaps: optimisticFlatViewFieldGroupMaps,
+    });
+
+    if (isDefined(existingFlatViewFieldGroup)) {
+      validationResult.errors.push({
+        code: ViewExceptionCode.INVALID_VIEW_DATA,
+        message: t`View field group with this universal identifier already exists`,
+        userFriendlyMessage: msg`View field group already exists`,
+      });
+    }
+
+    const flatView = findFlatEntityByUniversalIdentifier({
+      universalIdentifier: flatViewFieldGroupToValidate.viewUniversalIdentifier,
+      flatEntityMaps: flatViewMaps,
+    });
+
+    if (!isDefined(flatView)) {
+      validationResult.errors.push({
+        code: ViewExceptionCode.INVALID_VIEW_DATA,
+        message: t`View not found`,
+        userFriendlyMessage: msg`View not found`,
+      });
+    }
+
+    return validationResult;
+  }
+
+  public validateFlatViewFieldGroupDeletion({
+    flatEntityToValidate: { universalIdentifier },
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatViewFieldGroupMaps: optimisticFlatViewFieldGroupMaps,
+    },
+  }: UniversalFlatEntityValidationArgs<
+    typeof ALL_METADATA_NAME.viewFieldGroup
+  >): FailedFlatEntityValidation<'viewFieldGroup', 'delete'> {
+    const validationResult = getEmptyFlatEntityValidationError({
+      flatEntityMinimalInformation: {
+        universalIdentifier,
+      },
+      metadataName: 'viewFieldGroup',
+      type: 'delete',
+    });
+
+    const existingFlatViewFieldGroup = findFlatEntityByUniversalIdentifier({
+      universalIdentifier,
+      flatEntityMaps: optimisticFlatViewFieldGroupMaps,
+    });
+
+    if (!isDefined(existingFlatViewFieldGroup)) {
+      validationResult.errors.push({
+        code: ViewExceptionCode.INVALID_VIEW_DATA,
+        message: t`View field group to delete not found`,
+        userFriendlyMessage: msg`View field group to delete not found`,
+      });
+    }
+
+    return validationResult;
+  }
+
+  public validateFlatViewFieldGroupUpdate({
+    universalIdentifier,
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatViewFieldGroupMaps: optimisticFlatViewFieldGroupMaps,
+      flatViewMaps,
+    },
+  }: FlatEntityUpdateValidationArgs<
+    typeof ALL_METADATA_NAME.viewFieldGroup
+  >): FailedFlatEntityValidation<'viewFieldGroup', 'update'> {
+    const existingFlatViewFieldGroup = findFlatEntityByUniversalIdentifier({
+      universalIdentifier,
+      flatEntityMaps: optimisticFlatViewFieldGroupMaps,
+    });
+
+    const validationResult = getEmptyFlatEntityValidationError({
+      flatEntityMinimalInformation: {
+        universalIdentifier,
+      },
+      metadataName: 'viewFieldGroup',
+      type: 'update',
+    });
+
+    if (!isDefined(existingFlatViewFieldGroup)) {
+      validationResult.errors.push({
+        code: ViewExceptionCode.INVALID_VIEW_DATA,
+        message: t`View field group to update not found`,
+        userFriendlyMessage: msg`View field group to update not found`,
+      });
+
+      return validationResult;
+    }
+
+    const flatView = findFlatEntityByUniversalIdentifier({
+      universalIdentifier: existingFlatViewFieldGroup.viewUniversalIdentifier,
+      flatEntityMaps: flatViewMaps,
+    });
+
+    if (!isDefined(flatView)) {
+      validationResult.errors.push({
+        code: ViewExceptionCode.INVALID_VIEW_DATA,
+        message: t`View field group parent view not found`,
+        userFriendlyMessage: msg`View field group parent view not found`,
+      });
+    }
+
+    return validationResult;
+  }
+}
@@ -19,6 +19,7 @@ import { FlatRowLevelPermissionPredicateGroupValidatorService } from 'src/engine
 import { FlatRowLevelPermissionPredicateValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-validator.service';
 import { FlatLogicFunctionValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-logic-function-validator.service';
 import { FlatSkillValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-skill-validator.service';
+import { FlatViewFieldGroupValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-field-group-validator.service';
 import { FlatViewFieldValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-field-validator.service';
 import { FlatViewFilterGroupValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-filter-group-validator.service';
 import { FlatViewFilterValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-view-filter-validator.service';
@@ -34,6 +35,7 @@ import { FlatWebhookValidatorService } from 'src/engine/workspace-manager/worksp
    FlatViewFilterValidatorService,
    FlatViewFilterGroupValidatorService,
    FlatViewGroupValidatorService,
+    FlatViewFieldGroupValidatorService,
    FlatIndexValidatorService,
    FlatFieldMetadataValidatorService,
    FlatObjectMetadataValidatorService,
@@ -60,6 +62,7 @@ import { FlatWebhookValidatorService } from 'src/engine/workspace-manager/worksp
    FlatViewFilterValidatorService,
    FlatViewFilterGroupValidatorService,
    FlatViewGroupValidatorService,
+    FlatViewFieldGroupValidatorService,
    FlatIndexValidatorService,
    FlatFieldMetadataValidatorService,
    FlatObjectMetadataValidatorService,
@@ -19,6 +19,7 @@ import { WorkspaceMigrationLogicFunctionActionsBuilderService } from 'src/engine
 import { WorkspaceMigrationSkillActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/skill/workspace-migration-skill-actions-builder.service';
 import { WorkspaceMigrationFrontComponentActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/front-component/workspace-migration-front-component-actions-builder.service';
 import { WorkspaceMigrationViewFieldActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field/workspace-migration-view-field-actions-builder.service';
+import { WorkspaceMigrationViewFieldGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/workspace-migration-view-field-group-actions-builder.service';
 import { WorkspaceMigrationWebhookActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/webhook/workspace-migration-webhook-actions-builder.service';
 import { WorkspaceMigrationViewFilterGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-filter-group/workspace-migration-view-filter-group-actions-builder.service';
 import { WorkspaceMigrationViewFilterActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-filter/workspace-migration-view-filter-actions-builder.service';
@@ -36,6 +37,7 @@ import { WorkspaceMigrationBuilderValidatorsModule } from 'src/engine/workspace-
    WorkspaceMigrationViewFilterActionsBuilderService,
    WorkspaceMigrationViewFilterGroupActionsBuilderService,
    WorkspaceMigrationViewGroupActionsBuilderService,
+    WorkspaceMigrationViewFieldGroupActionsBuilderService,
    WorkspaceMigrationIndexActionsBuilderService,
    WorkspaceMigrationLogicFunctionActionsBuilderService,
    WorkspaceMigrationFieldActionsBuilderService,
@@ -61,6 +63,7 @@ import { WorkspaceMigrationBuilderValidatorsModule } from 'src/engine/workspace-
    WorkspaceMigrationViewFilterActionsBuilderService,
    WorkspaceMigrationViewFilterGroupActionsBuilderService,
    WorkspaceMigrationViewGroupActionsBuilderService,
+    WorkspaceMigrationViewFieldGroupActionsBuilderService,
    WorkspaceMigrationFieldActionsBuilderService,
    WorkspaceMigrationLogicFunctionActionsBuilderService,
    WorkspaceMigrationRoleActionsBuilderService,
@@ -0,0 +1,71 @@
+import { Injectable } from '@nestjs/common';
+
+import { v4 } from 'uuid';
+
+import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
+import { resolveUniversalRelationIdentifiersToIds } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util';
+import {
+  FlatCreateViewFieldGroupAction,
+  UniversalCreateViewFieldGroupAction,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/types/workspace-migration-view-field-group-action.type';
+import {
+  WorkspaceMigrationActionRunnerArgs,
+  WorkspaceMigrationActionRunnerContext,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
+
+@Injectable()
+export class CreateViewFieldGroupActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'create',
+  'viewFieldGroup',
+) {
+  override async transpileUniversalActionToFlatAction({
+    action,
+    allFlatEntityMaps,
+    flatApplication,
+    workspaceId,
+  }: WorkspaceMigrationActionRunnerArgs<UniversalCreateViewFieldGroupAction>): Promise<FlatCreateViewFieldGroupAction> {
+    const { viewId } = resolveUniversalRelationIdentifiersToIds({
+      flatEntityMaps: allFlatEntityMaps,
+      metadataName: action.metadataName,
+      universalForeignKeyValues: action.flatEntity,
+    });
+
+    return {
+      ...action,
+      flatEntity: {
+        ...action.flatEntity,
+        viewId,
+        viewFieldIds: [],
+        viewFieldUniversalIdentifiers: [],
+        id: action.id ?? v4(),
+        applicationId: flatApplication.id,
+        workspaceId,
+      },
+    };
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerContext<FlatCreateViewFieldGroupAction>,
+  ): Promise<void> {
+    const { flatAction, queryRunner, workspaceId } = context;
+    const { flatEntity } = flatAction;
+
+    const repository =
+      queryRunner.manager.getRepository<ViewFieldGroupEntity>(
+        ViewFieldGroupEntity,
+      );
+
+    await repository.insert({
+      ...flatEntity,
+      workspaceId,
+    });
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerContext<FlatCreateViewFieldGroupAction>,
+  ): Promise<void> {
+    return;
+  }
+}
@@ -0,0 +1,47 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
+import {
+  FlatDeleteViewFieldGroupAction,
+  UniversalDeleteViewFieldGroupAction,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/types/workspace-migration-view-field-group-action.type';
+import {
+  WorkspaceMigrationActionRunnerArgs,
+  WorkspaceMigrationActionRunnerContext,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
+
+@Injectable()
+export class DeleteViewFieldGroupActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'delete',
+  'viewFieldGroup',
+) {
+  override async transpileUniversalActionToFlatAction(
+    context: WorkspaceMigrationActionRunnerArgs<UniversalDeleteViewFieldGroupAction>,
+  ): Promise<FlatDeleteViewFieldGroupAction> {
+    return this.transpileUniversalDeleteActionToFlatDeleteAction(context);
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerContext<FlatDeleteViewFieldGroupAction>,
+  ): Promise<void> {
+    const { flatAction, queryRunner, workspaceId } = context;
+
+    const repository =
+      queryRunner.manager.getRepository<ViewFieldGroupEntity>(
+        ViewFieldGroupEntity,
+      );
+
+    await repository.delete({
+      id: flatAction.entityId,
+      workspaceId,
+    });
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerContext<FlatDeleteViewFieldGroupAction>,
+  ): Promise<void> {
+    return;
+  }
+}
@@ -0,0 +1,65 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
+import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
+import { resolveUniversalUpdateRelationIdentifiersToIds } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-update-relation-identifiers-to-ids.util';
+import {
+  FlatUpdateViewFieldGroupAction,
+  UniversalUpdateViewFieldGroupAction,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/view-field-group/types/workspace-migration-view-field-group-action.type';
+import {
+  WorkspaceMigrationActionRunnerArgs,
+  WorkspaceMigrationActionRunnerContext,
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
+
+@Injectable()
+export class UpdateViewFieldGroupActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'update',
+  'viewFieldGroup',
+) {
+  override async transpileUniversalActionToFlatAction(
+    context: WorkspaceMigrationActionRunnerArgs<UniversalUpdateViewFieldGroupAction>,
+  ): Promise<FlatUpdateViewFieldGroupAction> {
+    const { action, allFlatEntityMaps } = context;
+
+    const flatViewFieldGroup = findFlatEntityByUniversalIdentifierOrThrow({
+      flatEntityMaps: allFlatEntityMaps.flatViewFieldGroupMaps,
+      universalIdentifier: action.universalIdentifier,
+    });
+
+    const update = resolveUniversalUpdateRelationIdentifiersToIds({
+      metadataName: 'viewFieldGroup',
+      universalUpdate: action.update,
+      allFlatEntityMaps,
+    });
+
+    return {
+      type: 'update',
+      metadataName: 'viewFieldGroup',
+      entityId: flatViewFieldGroup.id,
+      update,
+    };
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerContext<FlatUpdateViewFieldGroupAction>,
+  ): Promise<void> {
+    const { flatAction, queryRunner, workspaceId } = context;
+    const { entityId, update } = flatAction;
+
+    const repository =
+      queryRunner.manager.getRepository<ViewFieldGroupEntity>(
+        ViewFieldGroupEntity,
+      );
+
+    await repository.update({ id: entityId, workspaceId }, update);
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerContext<FlatUpdateViewFieldGroupAction>,
+  ): Promise<void> {
+    return;
+  }
+}
@@ -30,7 +30,7 @@ export class CreateViewFieldActionHandlerService extends WorkspaceMigrationRunne
    flatApplication,
    workspaceId,
  }: WorkspaceMigrationActionRunnerArgs<UniversalCreateViewFieldAction>): Promise<FlatCreateViewFieldAction> {
-    const { fieldMetadataId, viewId } =
+    const { fieldMetadataId, viewId, viewFieldGroupId } =
      resolveUniversalRelationIdentifiersToIds({
        flatEntityMaps: allFlatEntityMaps,
        metadataName: action.metadataName,
@@ -43,6 +43,7 @@ export class CreateViewFieldActionHandlerService extends WorkspaceMigrationRunne
        ...action.flatEntity,
        fieldMetadataId,
        viewId,
+        viewFieldGroupId,
        id: action.id ?? v4(),
        applicationId: flatApplication.id,
        workspaceId,
@@ -53,6 +53,7 @@ export class CreateViewActionHandlerService extends WorkspaceMigrationRunnerActi
        applicationId: flatApplication.id,
        workspaceId,
        viewFieldIds: [],
+        viewFieldGroupIds: [],
        viewGroupIds: [],
        viewFilterIds: [],
        viewFilterGroupIds: [],
@@ -54,6 +54,9 @@ import { UpdateSkillActionHandlerService } from 'src/engine/workspace-manager/wo
 import { CreateWebhookActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/webhook/services/create-webhook-action-handler.service';
 import { DeleteWebhookActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/webhook/services/delete-webhook-action-handler.service';
 import { UpdateWebhookActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/webhook/services/update-webhook-action-handler.service';
+import { CreateViewFieldGroupActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field-group/services/create-view-field-group-action-handler.service';
+import { DeleteViewFieldGroupActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field-group/services/delete-view-field-group-action-handler.service';
+import { UpdateViewFieldGroupActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field-group/services/update-view-field-group-action-handler.service';
 import { CreateViewFieldActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/create-view-field-action-handler.service';
 import { DeleteViewFieldActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/delete-view-field-action-handler.service';
 import { UpdateViewFieldActionHandlerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/update-view-field-action-handler.service';
@@ -108,6 +111,10 @@ import { UpdateViewActionHandlerService } from 'src/engine/workspace-manager/wor
    UpdateViewGroupActionHandlerService,
    DeleteViewGroupActionHandlerService,

+    CreateViewFieldGroupActionHandlerService,
+    UpdateViewFieldGroupActionHandlerService,
+    DeleteViewFieldGroupActionHandlerService,
+
    CreateLogicFunctionActionHandlerService,
    DeleteLogicFunctionActionHandlerService,
    UpdateLogicFunctionActionHandlerService,
@@ -45,6 +45,7 @@ export const deriveMetadataEventsFromCreateAction = (
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':
@@ -22,6 +22,7 @@ export const deriveMetadataEventsFromDeleteAction = ({
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':
@@ -89,6 +89,7 @@ export const deriveMetadataEventsFromUpdateAction = ({
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':
@@ -45,6 +45,7 @@ export const optimisticallyApplyCreateActionOnAllFlatEntityMaps = ({
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':
@@ -22,6 +22,7 @@ export const optimisticallyApplyDeleteActionOnAllFlatEntityMaps = ({
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':
@@ -44,6 +44,7 @@ export const optimisticallyApplyUpdateActionOnAllFlatEntityMaps = ({
    case 'view':
    case 'viewField':
    case 'viewGroup':
+    case 'viewFieldGroup':
    case 'rowLevelPermissionPredicate':
    case 'rowLevelPermissionPredicateGroup':
    case 'viewFilterGroup':