17042 followups

packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts

@@ -11,9 +11,14 @@ import {
   UseGuards,
 } from '@nestjs/common';
 
-import { isDefined } from 'twenty-shared/utils';
 import { PermissionFlagType } from 'twenty-shared/constants';
+import { isDefined } from 'twenty-shared/utils';
 
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input';
 import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input';
 import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto';
@@ -25,11 +30,6 @@ import {
 } from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception';
 import { PageLayoutTabRestApiExceptionFilter } from 'src/engine/metadata-modules/page-layout-tab/filters/page-layout-tab-rest-api-exception.filter';
 import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 
 @Controller('rest/metadata/pageLayoutTabs')
 @UseGuards(WorkspaceAuthGuard)
@@ -98,7 +98,7 @@ export class PageLayoutTabController {
 
   @Delete(':id')
   @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
-  async delete(
+  async destroy(
     @Param('id') id: string,
     @AuthWorkspace() workspace: WorkspaceEntity,
   ): Promise<boolean> {

packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts

@@ -100,7 +100,7 @@ export class PageLayoutWidgetController {
 
   @Delete(':id')
   @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
-  async delete(
+  async destroy(
     @Param('id') id: string,
     @AuthWorkspace() workspace: WorkspaceEntity,
   ): Promise<boolean> {

packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts

@@ -350,6 +350,57 @@ export class PageLayoutService {
     return true;
   }
 
+  async destroyMany({
+    ids,
+    workspaceId,
+  }: {
+    ids: string[];
+    workspaceId: string;
+  }): Promise<boolean> {
+    if (ids.length === 0) {
+      return true;
+    }
+
+    const { flatPageLayoutMaps: existingFlatPageLayoutMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatPageLayoutMaps'],
+        },
+      );
+
+    const flatPageLayoutsToDestroy = ids.map((id) =>
+      fromDestroyPageLayoutInputToFlatPageLayoutOrThrow({
+        destroyPageLayoutInput: { id },
+        flatPageLayoutMaps: existingFlatPageLayoutMaps,
+      }),
+    );
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            pageLayout: {
+              flatEntityToCreate: [],
+              flatEntityToDelete: flatPageLayoutsToDestroy,
+              flatEntityToUpdate: [],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderException(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while destroying page layouts',
+      );
+    }
+
+    return true;
+  }
+
   private async destroyAssociatedDashboards({
     pageLayoutId,
     workspaceId,

packages/twenty-server/src/modules/dashboard/exceptions/dashboard.exception.ts

@@ -8,12 +8,14 @@ export enum DashboardExceptionCode {
   DASHBOARD_NOT_FOUND = 'DASHBOARD_NOT_FOUND',
   DASHBOARD_DUPLICATION_FAILED = 'DASHBOARD_DUPLICATION_FAILED',
   PAGE_LAYOUT_NOT_FOUND = 'PAGE_LAYOUT_NOT_FOUND',
+  DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED = 'DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED',
 }
 
 export enum DashboardExceptionMessageKey {
   DASHBOARD_NOT_FOUND = 'DASHBOARD_NOT_FOUND',
   DASHBOARD_DUPLICATION_FAILED = 'DASHBOARD_DUPLICATION_FAILED',
   PAGE_LAYOUT_NOT_FOUND = 'PAGE_LAYOUT_NOT_FOUND',
+  DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED = 'DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED',
 }
 
 const getDashboardExceptionUserFriendlyMessage = (
@@ -26,6 +28,8 @@ const getDashboardExceptionUserFriendlyMessage = (
       return msg`Failed to duplicate dashboard.`;
     case DashboardExceptionCode.PAGE_LAYOUT_NOT_FOUND:
       return msg`Page layout not found.`;
+    case DashboardExceptionCode.DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED:
+      return msg`Failed to restore dashboard(s) to soft deleted state.`;
     default:
       assertUnreachable(code);
   }
@@ -55,6 +59,8 @@ export const generateDashboardExceptionMessage = (
       return `Failed to duplicate dashboard: ${value}`;
     case DashboardExceptionMessageKey.PAGE_LAYOUT_NOT_FOUND:
       return `Page layout for dashboard "${value}" not found`;
+    case DashboardExceptionMessageKey.DASHBOARD_RESTORATION_TO_SOFT_DELETED_STATE_FAILED:
+      return `Failed to restore dashboard(s) to soft deleted state: ${value}`;
     default:
       assertUnreachable(key);
   }

packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-destroy-many.post-query.hook.ts

@@ -0,0 +1,60 @@
+import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
+
+import { type WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
+import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace/workspace.exception';
+import { DashboardToPageLayoutSyncService } from 'src/modules/dashboard/services/dashboard-to-page-layout-sync.service';
+import { type DashboardWorkspaceEntity } from 'src/modules/dashboard/standard-objects/dashboard.workspace-entity';
+
+@WorkspaceQueryHook({
+  key: `dashboard.destroyMany`,
+  type: WorkspaceQueryHookType.POST_HOOK,
+})
+export class DashboardDestroyManyPostQueryHook
+  implements WorkspacePostQueryHookInstance
+{
+  constructor(
+    private readonly dashboardToPageLayoutSyncService: DashboardToPageLayoutSyncService,
+  ) {}
+
+  async execute(
+    authContext: AuthContext,
+    _objectName: string,
+    payload: DashboardWorkspaceEntity[],
+  ): Promise<void> {
+    const workspace = authContext.workspace;
+
+    assertIsDefinedOrThrow(workspace, WorkspaceNotFoundDefaultError);
+
+    const destroyedDashboards = payload;
+
+    if (destroyedDashboards.length === 0) {
+      return;
+    }
+
+    const dashboardIds = destroyedDashboards
+      .map((dashboard) => dashboard.id)
+      .filter(isDefined);
+
+    try {
+      await this.dashboardToPageLayoutSyncService.destroyPageLayoutsForDashboards(
+        {
+          dashboardIds,
+          workspaceId: workspace.id,
+        },
+      );
+    } catch (error) {
+      await this.dashboardToPageLayoutSyncService.restoreDestroyedDashboardsToSoftDeletedState(
+        {
+          dashboards: destroyedDashboards,
+          workspaceId: workspace.id,
+        },
+      );
+
+      throw error;
+    }
+  }
+}

packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-destroy-one.post-query.hook.ts

@@ -0,0 +1,60 @@
+import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
+
+import { type WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
+import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace/workspace.exception';
+import { DashboardToPageLayoutSyncService } from 'src/modules/dashboard/services/dashboard-to-page-layout-sync.service';
+import { type DashboardWorkspaceEntity } from 'src/modules/dashboard/standard-objects/dashboard.workspace-entity';
+
+@WorkspaceQueryHook({
+  key: `dashboard.destroyOne`,
+  type: WorkspaceQueryHookType.POST_HOOK,
+})
+export class DashboardDestroyOnePostQueryHook
+  implements WorkspacePostQueryHookInstance
+{
+  constructor(
+    private readonly dashboardToPageLayoutSyncService: DashboardToPageLayoutSyncService,
+  ) {}
+
+  async execute(
+    authContext: AuthContext,
+    _objectName: string,
+    payload: DashboardWorkspaceEntity[],
+  ): Promise<void> {
+    const workspace = authContext.workspace;
+
+    assertIsDefinedOrThrow(workspace, WorkspaceNotFoundDefaultError);
+
+    const destroyedDashboards = payload;
+
+    if (destroyedDashboards.length === 0) {
+      return;
+    }
+
+    const dashboardIds = destroyedDashboards
+      .map((dashboard) => dashboard.id)
+      .filter(isDefined);
+
+    try {
+      await this.dashboardToPageLayoutSyncService.destroyPageLayoutsForDashboards(
+        {
+          dashboardIds,
+          workspaceId: workspace.id,
+        },
+      );
+    } catch (error) {
+      await this.dashboardToPageLayoutSyncService.restoreDestroyedDashboardsToSoftDeletedState(
+        {
+          dashboards: destroyedDashboards,
+          workspaceId: workspace.id,
+        },
+      );
+
+      throw error;
+    }
+  }
+}

packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts

@@ -5,8 +5,8 @@ import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-l
 import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { DashboardCreateManyPreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-create-many.pre-query.hook';
 import { DashboardCreateOnePreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook';
-import { DashboardDestroyManyPreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-destroy-many.pre-query.hook';
-import { DashboardDestroyOnePreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-destroy-one.pre-query.hook';
+import { DashboardDestroyManyPostQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-destroy-many.post-query.hook';
+import { DashboardDestroyOnePostQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-destroy-one.post-query.hook';
 import { DashboardToPageLayoutSyncService } from 'src/modules/dashboard/services/dashboard-to-page-layout-sync.service';
 
 @Module({
@@ -15,8 +15,8 @@ import { DashboardToPageLayoutSyncService } from 'src/modules/dashboard/services
     DashboardToPageLayoutSyncService,
     DashboardCreateOnePreQueryHook,
     DashboardCreateManyPreQueryHook,
-    DashboardDestroyOnePreQueryHook,
-    DashboardDestroyManyPreQueryHook,
+    DashboardDestroyOnePostQueryHook,
+    DashboardDestroyManyPostQueryHook,
   ],
 })
 export class DashboardQueryHookModule {}