대용량 번역 더보기 기능 수정.

projects/ucap-webmessenger-api-common/src/lib/apis/trans-mass-talk-download.ts

@@ -17,7 +17,9 @@ export interface TransMassTalkDownloadRequest extends APIRequest {
 }
 
 export interface TransMassTalkDownloadResponse extends APIResponse {
-  content?: string;
+  original?: string;
+  translation?: string;
+  locale?: string;
   userName?: string;
   regDate?: string;
   returnJson?: any;
@@ -27,7 +29,7 @@ const transMassTalkDownloadEncodeMap = {
   userSeq: 'p_user_seq',
   deviceType: 'p_device_type',
   token: 'p_token',
-  eventTransSeq: 'p_event_mass_seq'
+  eventTransSeq: 'p_event_trans_seq'
 };
 
 export const encodeTransMassTalkDownload: APIEncoder<TransMassTalkDownloadRequest> = (
@@ -40,13 +42,14 @@ export const decodeTransMassTalkDownload: APIDecoder<TransMassTalkDownloadRespon
   res: any
 ) => {
   try {
-    const json = JsonAnalization.receiveAnalization(res);
     return {
-      statusCode: json.StatusCode,
+      statusCode: res.StatusCode,
-      content: json.Content,
+      original: res.Original,
-      userName: json.UserName,
+      translation: res.Translation,
-      regDate: json.RegDate,
+      locale: res.Locale,
-      returnJson: res
+      userName: res.UserName,
+      regDate: res.RegDate,
+      returnJson: JSON.stringify(res)
     } as TransMassTalkDownloadResponse;
   } catch (e) {
     return {

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html

@@ -244,7 +244,7 @@
         [translationSimpleview]="translationSimpleview"
         (moreEvent)="onMoreEvent($event)"
         (massDetail)="onMassDetail($event)"
-        (massTranslationDetail)="onClickMassTranslationDetail($event)"
+        (massTranslationDetail)="onMassTranslationDetail($event)"
         (save)="onSave($event)"
         (fileViewer)="onFileViewer($event)"
         (contextMenu)="onContextMenuMessage($event)"

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts

@@ -852,21 +852,42 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     );
   }
 
-  onClickMassTranslationDetail(params: {
+  onMassTranslationDetail(params: {
-    contents: string;
+    message: Info<MassTranslationEventJson>;
     contentsType: string;
   }) {
-    this.dialogService.open<MassDetailComponent, MassDetailDialogData>(
+    this.commonApiService
-      MassDetailComponent,
+      .transMassTalkDownload({
-      {
+        userSeq: this.loginRes.userSeq,
-        disableClose: false,
+        deviceType: this.environmentsInfo.deviceType,
-        width: '550px',
+        token: this.loginRes.tokenString,
-        data: {
+        eventTransSeq: params.message.sentMessageJson.translationSeq.toString()
-          title: 'Detail View',
+      })
-          contents: params.contents
+      .pipe(take(1))
+      .subscribe(res => {
+        let contents = '';
+        if (res.statusCode === StatusCode.Success) {
+          contents =
+            params.contentsType === 'T' ? res.translation : res.original;
+        } else {
+          contents =
+            params.contentsType === 'T'
+              ? params.message.sentMessageJson.translation
+              : params.message.sentMessageJson.original;
         }
-      }
+
-    );
+        this.dialogService.open<MassDetailComponent, MassDetailDialogData>(
+          MassDetailComponent,
+          {
+            disableClose: false,
+            width: '550px',
+            data: {
+              title: this.translateService.instant('chat.detailView'),
+              contents
+            }
+          }
+        );
+      });
   }
 
   async onFileViewer(fileInfo: FileEventJson) {
@@ -1131,14 +1152,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     message: Info<EventJson>,
     clicktype?: string
   ) {
-    this.logger.debug(
-      'menuType',
-      menuType,
-      'message',
-      message,
-      'clicktype?',
-      clicktype
-    );
     switch (menuType) {
       case 'COPY':
         {
@@ -1194,30 +1207,43 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
             case EventType.Translation:
             case EventType.MassTranslation:
               {
-                let trgtStr = '';
+                const sentMessageJson: MassTranslationEventJson = message.sentMessageJson as MassTranslationEventJson;
-                if (clicktype === 'translation') {
+                this.commonApiService
-                  // translation
+                  .transMassTalkDownload({
-                  trgtStr = (message.sentMessageJson as TranslationEventJson)
+                    userSeq: this.loginRes.userSeq,
-                    .translation;
+                    deviceType: this.environmentsInfo.deviceType,
-                } else {
+                    token: this.loginRes.tokenString,
-                  // original
+                    eventTransSeq: sentMessageJson.translationSeq.toString()
-                  trgtStr = (message.sentMessageJson as TranslationEventJson)
+                  })
-                    .original;
+                  .pipe(take(1))
-                }
+                  .subscribe(res => {
-
+                    let contents = '';
-                if (this.clipboardService.copyFromContent(trgtStr)) {
+                    if (res.statusCode === StatusCode.Success) {
-                  this.snackBarService.open(
+                      contents =
-                    this.translateService.instant(
+                        clicktype === 'translation'
-                      'common.clipboard.results.copied'
+                          ? res.translation
-                    ),
+                          : res.original;
-                    '',
+                    } else {
-                    {
+                      contents =
-                      duration: 3000,
+                        clicktype === 'translation'
-                      verticalPosition: 'top',
+                          ? sentMessageJson.translation
-                      horizontalPosition: 'center'
+                          : sentMessageJson.original;
                     }
-                  );
+
-                }
+                    if (this.clipboardService.copyFromContent(contents)) {
+                      this.snackBarService.open(
+                        this.translateService.instant(
+                          'common.clipboard.results.copied'
+                        ),
+                        '',
+                        {
+                          duration: 3000,
+                          verticalPosition: 'top',
+                          horizontalPosition: 'center'
+                        }
+                      );
+                    }
+                  });
               }
               break;
             default:

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass-translation.component.ts

@@ -22,7 +22,7 @@ export class MassTranslationComponent implements OnInit {
 
   @Output()
   massTranslationDetail = new EventEmitter<{
-    contents: string;
+    message: Info<MassTranslationEventJson>;
     contentsType: string;
   }>();
 
@@ -37,15 +37,8 @@ export class MassTranslationComponent implements OnInit {
   ngOnInit() {}
 
   onClickMassDetail(contentsType: string) {
-    let contents = '';
-    if (contentsType === 'O') {
-      contents = this.message.sentMessageJson.original;
-    } else {
-      contents = this.message.sentMessageJson.translation;
-    }
-
     this.massTranslationDetail.emit({
-      contents,
+      message: this.message,
       contentsType
     });
   }

projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html

@@ -197,7 +197,7 @@
                 [translationSimpleview]="translationSimpleview"
                 [isMe]="message.senderSeq === loginRes.userSeq"
                 (contextMenu)="onContextMenuMessage($event, message)"
-                (massTranslationDetail)="onClickMassTranslationDetail($event)"
+                (massTranslationDetail)="onMassTranslationDetail($event)"
               >
               </ucap-chat-message-box-mass-translation>
 

projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts

@@ -5,7 +5,8 @@ import {
   EventType,
   InfoResponse,
   EventJson,
-  FileEventJson
+  FileEventJson,
+  MassTranslationEventJson
 } from '@ucap-webmessenger/protocol-event';
 import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
 import { UserInfo, RoomInfo, RoomType } from '@ucap-webmessenger/protocol-room';
@@ -63,7 +64,7 @@ export class MessagesComponent implements OnInit {
   massDetail = new EventEmitter<number>();
   @Output()
   massTranslationDetail = new EventEmitter<{
-    contents: string;
+    message: Info<MassTranslationEventJson>;
     contentsType: string;
   }>();
   @Output()
@@ -227,8 +228,8 @@ export class MessagesComponent implements OnInit {
     this.massDetail.emit(value);
   }
 
-  onClickMassTranslationDetail(params: {
+  onMassTranslationDetail(params: {
-    contents: string;
+    message: Info<MassTranslationEventJson>;
     contentsType: string;
   }) {
     this.massTranslationDetail.emit(params);