ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
leejh 2019-10-16 10:54:06 +09:00
parent 73eea5e240
commit 5982cdae69
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
View File

@ -29,7 +29,9 @@ export class ChatComponent implements OnInit, OnDestroy {
roomList: RoomInfo[];
roomUserList: RoomUserDetailData[];
roomUserShortList: RoomUserData[];
sessionVerinfo: VersionInfo2Response;
sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
roomSubscription: Subscription;
@ -59,10 +61,6 @@ export class ChatComponent implements OnInit, OnDestroy {
})
)
.subscribe();
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
}
ngOnDestroy(): void {

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
View File

@ -61,7 +61,9 @@ export class GroupComponent implements OnInit, OnDestroy {
loginRes: LoginResponse;
loginResSubscription: Subscription;
sessionVerinfo: VersionInfo2Response;
sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
constructor(
private store: Store<any>,
@ -72,9 +74,6 @@ export class GroupComponent implements OnInit, OnDestroy {
ngOnInit() {
const loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
this.companyCode = loginInfo.companyCode;
this.loginResSubscription = this.store

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
View File

@ -9,7 +9,7 @@
</div>
<div>
<ucap-profile-user-list-item *ngFor="let userInfo of selectedDepartmentUserInfoList$ | async"
[userInfo]="userInfo" [checkable]="true">
[userInfo]="userInfo" [checkable]="true" [sessionVerinfo]="sessionVerinfo">
</ucap-profile-user-list-item>
</div>
<div>

5
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

@ -16,6 +16,8 @@ import * as QueryStore from '@app/store/messenger/query';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
import { take, map, switchMap } from 'rxjs/operators';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
import { KEY_VER_INFO } from '@app/types/ver-info.type';
@Component({
selector: 'app-layout-chat-left-sidenav-organization',
@ -29,6 +31,9 @@ export class OrganizationComponent implements OnInit {
selectedDepartmentStatus$: Observable<DeptUserResponse>;
loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
constructor(
private store: Store<any>,

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

@ -42,7 +42,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
roomInfoSubscription: Subscription;
userInfoList$: Observable<UserInfo[]>;
eventListProcessing$: Observable<boolean>;
sessionVerInfo: VersionInfo2Response;
sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
constructor(
private store: Store<any>,
@ -52,9 +54,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
ngOnInit() {
const loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
this.sessionVerInfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
this.loginResSubscription = this.store
.pipe(