feat: soft delete #6576

magrinj · 2024-08-08T08:32:14Z

Implement soft delete on standards and custom objects.
This is a temporary solution, when we drop pg_graphql we should rely on the softDelete functions of TypeORM.

greptile-apps

PR Summary

The pull request introduces soft delete functionality across various modules and entities, ensuring records are marked as deleted without being permanently removed from the database.

GraphQL Schema Updates: packages/twenty-front/src/generated-metadata/graphql.ts updated to support new mutations and enums for soft delete.
Migration Script: packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts adds a softDelete column to the objectMetadata table.
Service Modifications: packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts updated to handle softDelete in findMany, findOne, deleteMany, and deleteOne methods.
Entity Updates: packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts and packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts updated to include softDelete and deletedAt fields.
Decorator Enhancements: packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-object.decorator.ts updated to include a softDelete option.

_{24 file(s) reviewed, 2 comment(s)}
_{Edit PR Review Bot Settings}

...wenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts

packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts

packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts

FelixMalfait · 2024-08-08T08:58:50Z

packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts

+    icon: 'IconCalendarMinus',
+  })
+  @WorkspaceIsNullable()
+  deletedAt?: Date | null;


When I look at a production workspace it seems this column was created already by I don't understand why!? I'm missing something

Hmm, on custom and standard objects ? I'm not having them on my computer

@FelixMalfait @magrinj probably because it's defined there as a default column for custom table creation https://github.com/twentyhq/twenty/blob/main/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/custom-table-default-column.util.ts
Originally I even put in the migration-runner in advance so it would have affected standard objects as well (and probably why you see some in prod) but it has been removed after many refactoring of this part I guess.

that was my initial assumption but then why aren't position or name also created on every table?

Even for recent standard objects from v0.23 I see deletedAt column but I don't see position (e.g. NoteTarget)

...-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts

Weiko · 2024-08-08T12:31:17Z

@magrinj it seems your filter is only on the first level of the queries.
For example if I fetch all the tasks of a company, tasks will be nested and it will probably return deleted tasks at that point.
Can we instead update the query builder (in the recursive functions we have) to inject a filter on each level (checking if the object has isDeletable) with deletedAt: null? Do you think it would be possible?
cc @FelixMalfait

FelixMalfait · 2024-08-13T08:20:33Z

Would be nice to be able to show trash icon also on saved views

packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx

packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx

packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts

FelixMalfait · 2024-08-13T09:24:13Z

packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx

+              // Why do we have two types, Filter and ViewFilter?
+              // Why key defition is already present in the Filter type and added on the fly here with mapViewFiltersToFilters ?
+              // Also as filter is spread into viewFilter, definition is present
+              // FixMe: Ugly hack to make it work


@lucasbordeau or @charlesBochet maybe you have context on this?

FelixMalfait · 2024-08-13T15:35:44Z

TODO : invalidate cache of trashed items query when an item is deleted? If I go to trash, then delete an item, then go back to trash, that item doesn't show up

FelixMalfait · 2024-08-16T08:52:22Z

Still a CSS issue on smaller screens:

FelixMalfait · 2024-08-16T09:04:04Z

Also I suspect withSoftDeleted is overly complex.
We want to apply the softDelete filter on every relations, always.
Because the parent record is soft-deleted, doesn't mean that when we display it we should display its soft-deleted childs. We should display the non-soft deleted childs.

It's not a blocker for merge, I think we should merge asap, even with this, and create a follow-up issue.

lucasbordeau · 2024-08-16T18:23:47Z

Working, I'm merging like this but we should review the following things :

Add restore / destroy instead of delete on table selection when we are on trash view
Brainstorm with @charlesBochet on Trash view, how should it we implement it in the frontend ?
Implement optimistic rendering for delete / restore / destroy
Refactor ViewFilter / Filter ?
Refactor SubMenuTopBarContainer and around.

greptile-apps

PR Summary

(updates since last review)

This pull request continues the implementation of soft delete functionality for standard and custom objects in the Twenty application. Key changes include:

Added new resolver factories DestroyManyResolverFactory and RestoreManyResolverFactory to support soft delete operations.
Implemented InformationBannerDeletedRecord component for displaying and managing deleted records in the UI.
Updated query builders and resolvers to handle soft-deleted records, including new withSoftDeleted options.
Refactored settings pages for improved navigation and consistency across the application.
Removed ExecuteQuickActionOnOneResolverFactory, suggesting a shift away from quick actions in favor of the new soft delete approach.

Key points to note:

New destroyMany and restoreMany operations added to support soft delete functionality.
UI components updated to handle and display soft-deleted records, improving user experience.
Query builders now consider isSoftDeletable flag when constructing queries.
Settings pages reorganized for better navigation, with consistent use of icons and breadcrumbs.
Removal of quick action related code suggests a significant change in how record actions are handled.

_{298 file(s) reviewed, 24 comment(s)}
_{Edit PR Review Bot Settings}

.../src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx

packages/twenty-front/src/modules/information-banner/constants/InformationBannerHeight.ts

packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts

packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts

...ver/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts

.../twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts

FelixMalfait · 2024-08-18T09:55:58Z

Thanks a lot @lucasbordeau!!!! Great if you can do the followups or at least create issues to make sure we don't forget any

magrinj marked this pull request as ready for review August 8, 2024 08:41

greptile-apps bot reviewed Aug 8, 2024

View reviewed changes

...wenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts Outdated Show resolved Hide resolved

packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts Outdated Show resolved Hide resolved

FelixMalfait reviewed Aug 8, 2024

View reviewed changes

packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts Outdated Show resolved Hide resolved

FelixMalfait reviewed Aug 8, 2024

View reviewed changes

...-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts Outdated Show resolved Hide resolved

FelixMalfait mentioned this pull request Aug 8, 2024

Add delete confirmation dialog for object detail view #6559

Closed

magrinj added 10 commits August 12, 2024 17:52

feat: wip soft delete

4eb1232

feat: soft delete

1b3b1d4

fix: typing issue

9097cae

fix: remove unused standard id

6396ad4

fix: rename soft delete in object metadata entity

abe16d1

fix: typo

c1b2129

fix: rename workspace custom decorator

50c5759

feat: wip nested filtering

286b6c5

feat: soft delete front-end wip

58f94b0

feat: working trash filter button

dff602f

magrinj force-pushed the feat/soft-delete branch from 1e2e094 to dff602f Compare August 12, 2024 15:53

magrinj marked this pull request as draft August 12, 2024 16:00

Merge branch 'main' into feat/soft-delete

8678e81

FelixMalfait reviewed Aug 13, 2024

View reviewed changes

packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx Outdated Show resolved Hide resolved

FelixMalfait reviewed Aug 13, 2024

View reviewed changes

packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx Outdated Show resolved Hide resolved

FelixMalfait reviewed Aug 13, 2024

View reviewed changes

packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts Outdated Show resolved Hide resolved

FelixMalfait reviewed Aug 13, 2024

View reviewed changes

FelixMalfait added 2 commits August 13, 2024 17:24

Fix show page not displaying deleted records

305ae89

Rename variants

3b62a3d

FelixMalfait added 2 commits August 13, 2024 21:40

Add logs and timeline activity for deletion

fc32b37

Remove createdAt and deletedAt field from showpage

56f11b2

Begin displaying header bar and migrate settings to new display

d8490ef

charlesBochet added the -PR: awaiting author label Aug 14, 2024

charlesBochet assigned FelixMalfait Aug 14, 2024

FelixMalfait added 3 commits August 15, 2024 09:39

Temp restore/destroy

4391112

Add restoreMany and destroyMany

307b946

Merge main

4c0ba58

Remove restored event

1315527

lucasbordeau added 2 commits August 16, 2024 18:44

Merge branch 'main' into feat/soft-delete

388d66b

Fixed vite

975ad41

lucasbordeau marked this pull request as ready for review August 16, 2024 18:18

Fixed GQL schema generation bug and forced refetch query

8c77f57

lucasbordeau approved these changes Aug 16, 2024

View reviewed changes

lucasbordeau added 2 commits August 16, 2024 20:45

Fixed lint

693e6d4

Fixed lint

d5fc22a

lucasbordeau merged commit db54469 into main Aug 16, 2024
8 of 14 checks passed

lucasbordeau deleted the feat/soft-delete branch August 16, 2024 19:20

greptile-apps bot reviewed Aug 16, 2024

View reviewed changes

lucasbordeau mentioned this pull request Aug 20, 2024

Fast follows on soft-deletion topic #6701

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: soft delete #6576

feat: soft delete #6576

magrinj commented Aug 8, 2024 •

edited

Loading

greptile-apps bot left a comment

FelixMalfait Aug 8, 2024

magrinj Aug 8, 2024

Weiko Aug 8, 2024 •

edited

Loading

FelixMalfait Aug 8, 2024

FelixMalfait Aug 8, 2024

Weiko commented Aug 8, 2024 •

edited

Loading

FelixMalfait commented Aug 13, 2024

FelixMalfait Aug 13, 2024

FelixMalfait commented Aug 13, 2024

FelixMalfait commented Aug 16, 2024

FelixMalfait commented Aug 16, 2024

lucasbordeau commented Aug 16, 2024 •

edited

Loading

greptile-apps bot left a comment

FelixMalfait commented Aug 18, 2024

feat: soft delete #6576

feat: soft delete #6576

Conversation

magrinj commented Aug 8, 2024 • edited Loading

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

FelixMalfait Aug 8, 2024

Choose a reason for hiding this comment

magrinj Aug 8, 2024

Choose a reason for hiding this comment

Weiko Aug 8, 2024 • edited Loading

Choose a reason for hiding this comment

FelixMalfait Aug 8, 2024

Choose a reason for hiding this comment

FelixMalfait Aug 8, 2024

Choose a reason for hiding this comment

Weiko commented Aug 8, 2024 • edited Loading

FelixMalfait commented Aug 13, 2024

FelixMalfait Aug 13, 2024

Choose a reason for hiding this comment

FelixMalfait commented Aug 13, 2024

FelixMalfait commented Aug 16, 2024

FelixMalfait commented Aug 16, 2024

lucasbordeau commented Aug 16, 2024 • edited Loading

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

FelixMalfait commented Aug 18, 2024

magrinj commented Aug 8, 2024 •

edited

Loading

Weiko Aug 8, 2024 •

edited

Loading

Weiko commented Aug 8, 2024 •

edited

Loading

lucasbordeau commented Aug 16, 2024 •

edited

Loading