diff --git a/src/app/infra/socket/signalR/signalR.ts b/src/app/infra/socket/signalR/signalR.ts index a70b02c0f..9b863fadb 100644 --- a/src/app/infra/socket/signalR/signalR.ts +++ b/src/app/infra/socket/signalR/signalR.ts @@ -131,7 +131,6 @@ export class SignalRConnection { input?.data?.roomName == message?.data.roomName && typeof input?.data?.roomName == 'string' }), - first() ).subscribe(value => { resolve(ok(value.data as unknown as T)) // console.log('Received valid value:', value); diff --git a/src/app/module/chat/domain/mapper/messageMapper.ts b/src/app/module/chat/domain/mapper/messageMapper.ts index 387b20142..4e7bc021d 100644 --- a/src/app/module/chat/domain/mapper/messageMapper.ts +++ b/src/app/module/chat/domain/mapper/messageMapper.ts @@ -25,7 +25,8 @@ export class MessageMapper { fileName: e.fileName, applicationId: e.applicationId || 0, docId: Number(e.docId) || 0, - mimeType: e.mimeType + mimeType: e.mimeType, + description: e.description }))[0] || {} } diff --git a/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts b/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts index 7722f30b4..c49e4a8ed 100644 --- a/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts +++ b/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts @@ -24,6 +24,7 @@ export class ListenSendMessageUseCase { return this.MessageSocketRepositoryService.listenToMessages().pipe( filter((message) => { + return message?.requestId?.startsWith(InstanceId) && message?.roomId == roomId }), map(message => message) diff --git a/src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts b/src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts index 69e34ad5e..52b2161d5 100644 --- a/src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts +++ b/src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts @@ -26,7 +26,7 @@ export class MessageAttachmentByMessageIdUseCase { private AttachmentLocalDataSource: AttachmentLocalDataSource ) { } - @XTracerAsync({name:'Message-Attachment-By-MessageIdUseCase', module:'chat', bugPrint: true, waitNThrow: 5000}) + @XTracerAsync({name:'Message-Attachment-By-MessageIdUseCase', module:'chat', bugPrint: true, waitNThrow: 15000}) async execute(input: MessageAttachmentByMessageIdInput, tracing?: TracingType): Promise> { tracing.setAttribute('messageId', input.id) @@ -36,6 +36,7 @@ export class MessageAttachmentByMessageIdUseCase { }) if(getLocalAttachment.isOk() && getLocalAttachment.value) { + tracing.setAttribute('download', 'false') // has blob if(getLocalAttachment.value.file) { diff --git a/src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts b/src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts index 1fdafb5a6..553df0850 100644 --- a/src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts +++ b/src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts @@ -39,7 +39,8 @@ export const MessageInputDTOSchema = z.object({ fileName: z.string().optional(), applicationId: z.number().optional(), docId: z.number().optional(), - mimeType: z.string().optional() + mimeType: z.string().optional(), + description: z.string().optional() }).optional() }); export type MessageInputDTO = z.infer diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html index 1d5749f8f..122b88d40 100644 --- a/src/app/ui/chat/component/messages/messages.page.html +++ b/src/app/ui/chat/component/messages/messages.page.html @@ -97,7 +97,7 @@ -
+
@@ -110,7 +110,7 @@ - {{ attachment.fileName}} + {{ attachment?.fileName || attachment?.description }}
diff --git a/src/app/ui/chat/component/messages/messages.page.ts b/src/app/ui/chat/component/messages/messages.page.ts index 3d57c7a63..7b8dbbada 100644 --- a/src/app/ui/chat/component/messages/messages.page.ts +++ b/src/app/ui/chat/component/messages/messages.page.ts @@ -1061,6 +1061,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy const data = res.data; + console.log(data) + if (data.selected) { // "title": res.data.selected.Assunto, @@ -1084,6 +1086,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy fileType: MessageAttachmentFileType.Doc, applicationId: res.data.selected.ApplicationType, docId: res.data.selected.Id, + description: res.data.selected.Assunto }] const date = whatsappDate(message.sentAt, false) @@ -1093,7 +1096,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.messages1[this.roomId].push(Ballon) } - this.messages1[this.roomId].push(new MessageViewModal(message)) + this.messages1[this.roomId].push(message) setTimeout(() => { this.scrollToBottomClicked() }, 100)