diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
index 2e8de758..79460a4a 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
@@ -5,7 +5,7 @@
chat
-
+
group
@@ -14,8 +14,14 @@
- chat
+ chat
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
index 4fab62cd..82ce0e91 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
@@ -82,9 +82,7 @@ export class GroupComponent implements OnInit, OnDestroy {
loginRes: LoginResponse;
loginResSubscription: Subscription;
- sessionVerinfo = this.sessionStorageService.get(
- KEY_VER_INFO
- );
+ sessionVerinfo: VersionInfo2Response;
constructor(
private store: Store,
@@ -94,6 +92,9 @@ export class GroupComponent implements OnInit, OnDestroy {
) {}
ngOnInit() {
+ this.sessionVerinfo = this.sessionStorageService.get(
+ KEY_VER_INFO
+ );
const loginInfo = this.sessionStorageService.get(KEY_LOGIN_INFO);
this.companyCode = loginInfo.companyCode;
@@ -148,6 +149,7 @@ export class GroupComponent implements OnInit, OnDestroy {
}
ngOnDestroy(): void {
+ this.logger.debug('ngOnDestroy');
if (!!this.loginResSubscription) {
this.loginResSubscription.unsubscribe();
}
diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
index 76af2331..a38131ec 100644
--- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
+++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
@@ -1,51 +1,57 @@
-
- 0 && !checkable" [togglePosition]="'before'">
+
+ 0 && !checkable"
+ [togglePosition]="'before'"
+ >
즐겨찾기
-
+
-
-
-
+
{{ groupBuddy.group.name }}
-
-
+
-
-
-
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
index 37ed56cd..4cb90c4b 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
@@ -4,8 +4,8 @@
{{ userPresence.pcStatus }}
+ *ngIf="presence && presence.pcStatus"
+ >{{ presence.pcStatus }}
-
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
index 1ae14b37..ebad794d 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
@@ -37,9 +37,7 @@ export class UserListItemComponent implements OnInit, OnDestroy {
@Input()
profileImageRoot?: string;
@Input()
- set presence(value: StatusBulkInfo | StatusInfo) {
- this.userPresence = value;
- }
+ presence: StatusBulkInfo | StatusInfo;
@Input()
checkable = false;
@Input()
@@ -58,7 +56,6 @@ export class UserListItemComponent implements OnInit, OnDestroy {
userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN;
}>();
- userPresence: StatusBulkInfo | StatusInfo;
PresenceType = PresenceType;
// private profileImageRootSubscription: Subscription;
@@ -94,7 +91,7 @@ export class UserListItemComponent implements OnInit, OnDestroy {
let rtnClass = '';
switch (type) {
case 'pc':
- status = this.userPresence.pcStatus;
+ status = this.presence.pcStatus;
break;
}
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/image.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/image.component.ts
index 7990aea8..8164653c 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/image.component.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/components/image.component.ts
@@ -8,10 +8,10 @@ import { ucapAnimations } from '../animations';
selector: 'ucap-ui-imaage',
template: `
`,
styles: [],