fix: resolve rebase conflicts

Co-authored-by: José Pereira <[email protected]>
twentyhq · Jun 10, 2024 · 69026e1 · 69026e1
1 parent 443c42c
commit 69026e1
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 172 deletions.
diff --git a/...twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx b/...twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx
@@ -40,9 +40,7 @@ const RIGHT_DRAWER_PAGES_CONFIG = {
   },
   [RightDrawerPages.ViewEmailThread]: {
     page: <RightDrawerEmailThread />,
-    topBar: (
-      <RightDrawerTopBar page={RightDrawerPages.ViewEmailThread}  showActionBar={false} showMembersBar={true} />
-    ),
+    topBar: <RightDrawerTopBar page={RightDrawerPages.ViewEmailThread} />,
   },
   [RightDrawerPages.ViewCalendarEvent]: {
     page: <RightDrawerCalendarEvent />,

diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { Chip, ChipAccent, ChipSize, useIcons } from 'twenty-ui';
 
 import { ActivityActionBar } from '@/activities/right-drawer/components/ActivityActionBar';
+import { MessageThreadMembersBar } from '@/activities/right-drawer/components/MessageThreadMembersBar';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState';
 import { RightDrawerTopBarCloseButton } from '@/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton';
@@ -103,6 +104,9 @@ export const RightDrawerTopBar = ({ page }: { page: RightDrawerPages }) => {
         </StyledMinimizeTopBarTitleContainer>
       )}
       <StyledTopBarWrapper>
+        {page === RightDrawerPages.ViewEmailThread && (
+          <MessageThreadMembersBar />
+        )}
         {!isMobile && !isRightDrawerMinimized && (
           <RightDrawerTopBarMinimizeButton />
         )}

diff --git a/...ges/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts b/...ges/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts
@@ -7,22 +7,16 @@ import { BlocklistRepository } from 'src/modules/connected-account/repositories/
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { AuditLogRepository } from 'src/modules/timeline/repositiories/audit-log.repository';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
-import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
-import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
-import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
-import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
-import { MessageThreadMemberRepository } from 'src/modules/messaging/repositories/message-thread-member.repository';
-import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
-import { PersonRepository } from 'src/modules/person/repositories/person.repository';
-import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
-import { AttachmentRepository } from 'src/modules/attachment/repositories/attachment.repository';
-import { CommentRepository } from 'src/modules/activity/repositories/comment.repository';
 import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository';
 import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import { MessageParticipantRepository } from 'src/modules/messaging/common/repositories/message-participant.repository';
 import { MessageThreadRepository } from 'src/modules/messaging/common/repositories/message-thread.repository';
+import { MessageThreadMemberRepository } from 'src/modules/messaging/common/repositories/message-thread-member.repository';
 import { MessageRepository } from 'src/modules/messaging/common/repositories/message.repository';
 import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { AttachmentRepository } from 'src/modules/attachment/repositories/attachment.repository';
+import { CommentRepository } from 'src/modules/activity/repositories/comment.repository';
 
 export const metadataToRepositoryMapping = {
   AuditLogWorkspaceEntity: AuditLogRepository,

diff --git a/...nty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts b/...nty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts
@@ -27,7 +27,7 @@ import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/stan
 import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
 import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
-import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-thread-members.workspace-entity';
+import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity';
 
 export const standardObjectMetadataDefinitions = [
   ActivityTargetWorkspaceEntity,

diff --git a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts
@@ -19,6 +19,7 @@ import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/
 import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
 import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
+import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity';
 
 @Module({
   imports: [
@@ -32,6 +33,7 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso
       MessageParticipantWorkspaceEntity,
       MessageWorkspaceEntity,
       MessageThreadWorkspaceEntity,
+      MessageThreadMemberWorkspaceEntity,
     ]),
     TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
     AddPersonIdAndWorkspaceMemberIdModule,

diff --git a/...s/twenty-server/src/modules/messaging/common/services/messaging-message-thread.service.ts b/...s/twenty-server/src/modules/messaging/common/services/messaging-message-thread.service.ts
@@ -10,8 +10,8 @@ import { MessageRepository } from 'src/modules/messaging/common/repositories/mes
 import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
 import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
 import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
-import { MessageThreadMemberRepository } from 'src/modules/messaging/repositories/message-thread-member.repository';
-import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-thread-members.workspace-entity';
+import { MessageThreadMemberRepository } from 'src/modules/messaging/common/repositories/message-thread-member.repository';
+import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity';
 
 @Injectable()
 export class MessagingMessageThreadService {

diff --git a/...r/src/modules/messaging/common/standard-objects/message-thread-members.object-metadata.ts b/...r/src/modules/messaging/common/standard-objects/message-thread-members.object-metadata.ts
diff --git a/.../src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity.ts b/.../src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity.ts
@@ -7,7 +7,7 @@ import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity
 import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
-import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-thread.workspace-entity';
+import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 

diff --git a/...y-server/src/modules/messaging/common/standard-objects/message-thread.workspace-entity.ts b/...y-server/src/modules/messaging/common/standard-objects/message-thread.workspace-entity.ts
@@ -16,7 +16,7 @@ import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/mes
 import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-thread-members.workspace-entity';
+import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity';
 
 @WorkspaceEntity({
   standardId: STANDARD_OBJECT_IDS.messageThread,

diff --git a/...ages/twenty-server/src/modules/messaging/services/message-thread/message-thread.module.ts b/...ages/twenty-server/src/modules/messaging/services/message-thread/message-thread.module.ts
diff --git a/packages/twenty-server/src/modules/messaging/services/message/message.module.ts b/packages/twenty-server/src/modules/messaging/services/message/message.module.ts
diff --git a/...ages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.module.ts b/...ages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.module.ts
diff --git a/...server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts b/...server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
@@ -26,7 +26,7 @@ import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
 import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
-import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-thread-members.workspace-entity';
+import { MessageThreadMemberWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread-members.workspace-entity';
 
 @WorkspaceEntity({
   standardId: STANDARD_OBJECT_IDS.workspaceMember,