scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-11-11 10:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix main post merge

Browse Source
This commit is contained in:
Charles Bochet
2023-11-16 17:23:05 +01:00
parent dee38bb901
commit 31adb24ffd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
front/src/modules/activities/types/Activity.ts
View File

@@ -15,9 +15,12 @@ export type Activity = {
type: ActivityType; type: ActivityType;
title: string; title: string;
body: string; body: string;
author: WorkspaceMember; author: Pick<WorkspaceMember, 'id' | 'firstName' | 'lastName' | 'avatarUrl'>;
authorId: string; authorId: string;
assignee: WorkspaceMember | null; assignee: Pick<
WorkspaceMember,
'id' | 'firstName' | 'lastName' | 'avatarUrl'
> | null;
assigneeId: string | null; assigneeId: string | null;
comments: Comment[]; comments: Comment[];
}; };

2
front/src/modules/activities/types/Comment.ts
View File

@@ -6,5 +6,5 @@ export type Comment = {
body: string; body: string;
updatedAt: string; updatedAt: string;
activityId: string; activityId: string;
author: WorkspaceMember; author: Pick<WorkspaceMember, 'id' | 'firstName' | 'lastName' | 'avatarUrl'>;
}; };