diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index fff56f70..04e4b900 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -73,6 +73,7 @@ ; + eventInfoStatus$: Observable; sessionVerInfo: VersionInfo2Response; isRecalledMessage = isRecalled; @@ -147,6 +149,10 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked { select(AppStore.MessengerSelector.EventSelector.selectAllInfoList) ); + this.eventInfoStatus$ = this.store.pipe( + select(AppStore.MessengerSelector.EventSelector.infoStatus) + ); + this.psChatContent.directiveRef.scrollToBottom(0, 0); } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.html index 09906b5f..95d6278d 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.html @@ -1,20 +1,23 @@
-
+
  • {{ fileInfo.FileName }}
  • - {{ fileInfo.AttSize }} + {{ fileInfo.AttSize | ucapBytes }}
  • {{ fileInfo.FileExt }}
-
-
    +
    +
      +
    • 기간이 만료된 파일입니다.
    • +
    +
    • diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss index e8649832..a3979d30 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss @@ -33,13 +33,15 @@ background-image: url(/assets/images/file/icon_talk_hwp_d.png); } } - &.ppt { + &.ppt, + &.pptx { background-image: url(/assets/images/file/icon_talk_ppt.png); &.disable { background-image: url(/assets/images/file/icon_talk_ppt_d.png); } } - &.xls { + &.xls, + &.xlsx { background-image: url(/assets/images/file/icon_talk_xls.png); &.disable { background-image: url(/assets/images/file/icon_talk_xls_d.png); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.ts index 655b8f64..dc185431 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.ts @@ -10,6 +10,9 @@ import { NGXLogger } from 'ngx-logger'; export class AttachFileComponent implements OnInit { @Input() fileInfo: FileInfo; + @Input() + expired = false; + @Output() save = new EventEmitter(); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.html index 3aa86267..2caf80c8 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.html @@ -1,9 +1,35 @@ - - + + - - - + + + + + diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts index 553c2d4f..86052166 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Output, Input, EventEmitter } from '@angular/core'; -import { Info } from '@ucap-webmessenger/protocol-event'; +import { Info, InfoResponse } from '@ucap-webmessenger/protocol-event'; import { StatusCode } from '@ucap-webmessenger/api'; import { FileType } from '@ucap-webmessenger/protocol-file'; import { NGXLogger } from 'ngx-logger'; @@ -13,6 +13,8 @@ import { FileInfo } from '../../models/file-info.json'; export class FileComponent implements OnInit { @Input() message: Info; + @Input() + eventInfoStatus: InfoResponse; @Output() save = new EventEmitter<{ fileInfo: FileInfo; type: string }>(); @@ -34,6 +36,17 @@ export class FileComponent implements OnInit { } } + getExpiredFile() { + if ( + !!this.eventInfoStatus && + this.eventInfoStatus.validFileBaseSeq < this.message.seq + ) { + return false; + } else { + return true; + } + } + onClickImageViewer(fileInfo: FileInfo) { this.imageViewer.emit(this.fileInfo); } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.ts index e34add3e..630936cf 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.ts @@ -10,6 +10,8 @@ import { FileInfo } from '../../models/file-info.json'; export class ImageComponent implements OnInit { @Input() fileInfo: FileInfo; + @Input() + expired = false; constructor(private logger: NGXLogger) {} diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.ts index b53ae704..cf717735 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video.component.ts @@ -10,6 +10,8 @@ import { FileInfo } from '../../models/file-info.json'; export class VideoComponent implements OnInit { @Input() fileInfo: FileInfo; + @Input() + expired = false; constructor(private logger: NGXLogger) {} diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html index c211ed7c..d3b1638a 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html @@ -103,6 +103,7 @@