From 610ca140a61242b3ef5eaafb8885732307d0b2b2 Mon Sep 17 00:00:00 2001 From: leejh Date: Mon, 4 Nov 2019 11:35:52 +0900 Subject: [PATCH 1/4] =?UTF-8?q?bug=20fix=20::=20=EC=A1=B0=EC=A7=81?= =?UTF-8?q?=EB=8F=84=20>=20=EB=B6=80=EC=84=9C=EC=9B=90=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=9D=98=20=EC=A0=84=EC=B2=B4=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20::=20=EB=B6=80=EC=84=9C=EC=9B=90=EC=9D=B4=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EB=B6=80=EC=84=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=84=EC=B2=B4=EC=84=A0=ED=83=9D=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-sidenav/organization.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 57779f26..bbd7ddcb 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -195,7 +195,8 @@ export class OrganizationComponent implements OnInit, OnDestroy { /** 전체 체크여부 */ getCheckedAllUser() { if ( - this.selectedDepartmentUserInfoList && + !this.selectedDepartmentUserInfoList || + this.selectedDepartmentUserInfoList.length === 0 || this.selectedDepartmentUserInfoList.filter( item => !( From c7a7f6ca23f54324b8b032f56582d81613c83aab Mon Sep 17 00:00:00 2001 From: leejh Date: Mon, 4 Nov 2019 11:36:58 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B8=B0=20::?= =?UTF-8?q?=20=EB=8C=80=ED=99=94=20=EC=83=81=EB=8C=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.ts | 42 ++++++------- .../chat/create-chat.dialog.component.html | 15 +++-- .../chat/create-chat.dialog.component.ts | 40 +++++++++++- .../src/app/store/messenger/room/actions.ts | 17 ++++- .../src/app/store/messenger/room/effects.ts | 62 ++++++++++++++++++- 5 files changed, 142 insertions(+), 34 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 2e481ec1..21d1e8a6 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -576,9 +576,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { switch (menuType) { case 'ADD_MEMBER': { - console.log(this.roomInfo); - console.log(this.userInfoList); - const result = await this.dialogService.open< CreateChatDialogComponent, CreateChatDialogData, @@ -587,39 +584,36 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { width: '600px', data: { type: UserSelectDialogType.EditChatMember, - title: 'Edit Chat Member' - // , - // curRoomUser: this.userInfoList + title: 'Edit Chat Member', + curRoomUser: this.userInfoList.filter( + user => user.seq !== this.loginRes.userSeq + ) } }); if (!!result && !!result.choice && result.choice) { const userSeqs: number[] = []; - let roomSeq = ''; if ( !!result.selectedUserList && result.selectedUserList.length > 0 ) { - result.selectedUserList.map(user => userSeqs.push(user.seq)); + result.selectedUserList.map(user => { + userSeqs.push(user.seq); + }); } - if (!!result.selectedRoom) { - roomSeq = result.selectedRoom.roomSeq; - } + if (userSeqs.length > 0) { + // include me + userSeqs.push(this.loginRes.userSeq); - if (userSeqs.length > 0 || roomSeq.trim().length > 0) { - // this.store.dispatch( - // EventStore.forward({ - // senderSeq: this.loginRes.userSeq, - // req: { - // roomSeq: '-999', - // eventType: message.type, - // sentMessage: message.sentMessage - // }, - // trgtUserSeqs: userSeqs, - // trgtRoomSeq: roomSeq - // }) - // ); + this.store.dispatch( + RoomStore.inviteOrOpen({ + req: { + divCd: 'Invite', + userSeqs + } + }) + ); } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index eaa233e9..0b7338cc 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -73,7 +73,12 @@
-
검색결과 ({{ searchUserInfos.length }}명)
+
+ 검색결과 + ({{ searchUserInfos.length }}명) +
{{ userInfo.name }} - clear + clear + {{ selectedUserList.length }}명 diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts index dc4f3346..b39c00b5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts @@ -57,12 +57,22 @@ export interface CreateChatDialogData { /** CASE :: EventForward */ ignoreRoom?: RoomInfo[]; /** CASE :: EditCharMember */ - curRoomUser?: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; + curRoomUser?: ( + | UserInfo + | UserInfoSS + | UserInfoF + | UserInfoDN + | RoomUserInfo)[]; } export interface CreateChatDialogResult { choice: boolean; - selectedUserList?: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; + selectedUserList?: ( + | UserInfo + | UserInfoSS + | UserInfoF + | UserInfoDN + | RoomUserInfo)[]; selectedRoom?: RoomInfo; groupName?: string; oldGroup?: GroupDetailData; @@ -117,7 +127,12 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { roomSubscription: Subscription; // 수집 데이터 - selectedUserList: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[] = []; + selectedUserList: ( + | UserInfo + | UserInfoSS + | UserInfoF + | UserInfoDN + | RoomUserInfo)[] = []; isShowSelectedUserList = true; selectedRoom: RoomInfo; @@ -208,6 +223,10 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { this.inputForm = this.formBuilder.group({ groupName: ['', [Validators.required]] }); + + if (this.data.type === UserSelectDialogType.EditChatMember) { + this.selectedUserList = this.data.curRoomUser; + } } ngOnDestroy(): void { @@ -239,6 +258,21 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { } } + getChipsRemoveYn(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { + if ( + this.data.type === UserSelectDialogType.EditChatMember && + !!this.data.curRoomUser && + this.data.curRoomUser.length > 0 + ) { + return !( + this.data.curRoomUser.filter(user => user.seq === userInfo.seq).length > + 0 + ); + } else { + return true; + } + } + onSelectedTabChange(tabChangeEvent: MatTabChangeEvent): void { if (tabChangeEvent.index === 2) { this.selectedUserList = []; diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts index 5184c660..d0857791 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts @@ -15,7 +15,9 @@ import { ExitRequest, ExitResponse, Open3Request, - Open3Response + Open3Response, + InviteRequest, + InviteResponse } from '@ucap-webmessenger/protocol-room'; import { ReadNotification } from '@ucap-webmessenger/protocol-event'; @@ -115,6 +117,19 @@ export const openTimerFailure = createAction( props<{ error: any }>() ); +export const inviteOrOpen = createAction( + '[Messenger::Room] Invite or Open', + props<{ req: OpenRequest }>() +); +export const inviteSuccess = createAction( + '[Messenger::Room] Invite Success', + props() +); +export const inviteFailure = createAction( + '[Messenger::Room] Invite Failure', + props<{ error: any }>() +); + export const exit = createAction( '[Messenger::Room] Exit', props() diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts index ba8c3220..b45d6eb3 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts @@ -30,7 +30,9 @@ import { UpdateResponse, OpenResponse, ExitResponse, - Open3Response + Open3Response, + RoomType, + InviteResponse } from '@ucap-webmessenger/protocol-room'; import * as ChatStore from '@app/store/messenger/chat'; @@ -55,7 +57,10 @@ import { exitFailure, openTimer, openTimerSuccess, - openTimerFailure + openTimerFailure, + inviteOrOpen, + inviteSuccess, + inviteFailure } from './actions'; import { SessionStorageService } from '@ucap-webmessenger/web-storage'; import { LoginInfo, KEY_LOGIN_INFO } from '@app/types'; @@ -204,6 +209,59 @@ export class Effects { ) ); + inviteOrOpen$ = createEffect(() => + this.actions$.pipe( + ofType(inviteOrOpen), + withLatestFrom( + this.store.pipe( + select((state: any) => state.messenger.room.roomInfo as RoomInfo) + ) + ), + exhaustMap(([action, roomInfo]) => { + if (roomInfo.roomType === RoomType.Single) { + // Re Open + return this.roomProtocolService.open(action.req).pipe( + map((res: OpenResponse) => { + return openSuccess({ res }); + }), + catchError(error => of(openFailure({ error }))) + ); + } else if (roomInfo.roomType === RoomType.Multi) { + // Invite + return this.roomProtocolService + .invite({ + roomSeq: roomInfo.roomSeq, + inviteUserSeqs: action.req.userSeqs + }) + .pipe( + map((res: InviteResponse) => { + return inviteSuccess(res); + }), + catchError(error => of(inviteFailure({ error }))) + ); + } else { + return of(inviteFailure({ error: 'room type is error!!' })); + } + }) + ) + ); + inviteSuccess$ = createEffect(() => + this.actions$.pipe( + ofType(inviteSuccess), + map(action => { + return ChatStore.selectedRoom({ roomSeq: action.roomSeq }); + // const loginInfo = this.sessionStorageService.get( + // KEY_LOGIN_INFO + // ); + // return info({ + // roomSeq: action.roomSeq, + // isDetail: true, + // localeCode: loginInfo.localeCode + // }); + }) + ) + ); + exit$ = createEffect(() => this.actions$.pipe( ofType(exit), From bceade22612724f134414f82f86e36a7d1d934a5 Mon Sep 17 00:00:00 2001 From: leejh Date: Mon, 4 Nov 2019 13:09:58 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/messenger/components/main.page.component.html | 9 ++++++--- .../pages/messenger/components/main.page.component.scss | 1 + .../lib/components/float-action-button.component.scss | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index 5b0e9a0d..d0fa9ea0 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -4,9 +4,12 @@
- --> + -
+
diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss index 953aa782..6e3937f8 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss @@ -8,6 +8,7 @@ width: 380px; height: 100%; flex: 0 0 auto; + position: relative; } .contents { flex: 1 1 auto; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss index 1c54954a..f74e9c21 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss @@ -1,5 +1,5 @@ .fab-container { - position: fixed; + position: absolute; bottom: 15px; right: 15px; z-index: 100; From 437209bf7f82df369cf91b2a1292b78489961737 Mon Sep 17 00:00:00 2001 From: leejh Date: Mon, 4 Nov 2019 17:52:47 +0900 Subject: [PATCH 4/4] =?UTF-8?q?FAB=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20::=20=EB=8C=80=20=EB=A9=94=EB=89=B4=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-side.component.html | 21 ++- .../components/left-side.component.ts | 121 +++++++++++++++--- .../left-sidenav/group.component.ts | 49 ++----- .../left-sidenav/organization.component.ts | 1 - .../lib/components/list-item.component.html | 9 +- .../src/lib/ucap-ui-room.module.ts | 3 +- 6 files changed, 143 insertions(+), 61 deletions(-) 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 3784e5ce..89087066 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 @@ -6,14 +6,22 @@
--> - - + + group - + - + - + device_hub @@ -37,7 +45,7 @@ class="organization-side" > - + phone @@ -45,6 +53,7 @@ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts index f26c4022..9b1c15ce 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts @@ -12,13 +12,22 @@ import { Store, select } from '@ngrx/store'; import * as AppStore from '@app/store'; import * as ChatStore from '@app/store/messenger/chat'; +import * as SyncStore from '@app/store/messenger/sync'; import { UserInfo } from '@ucap-webmessenger/protocol-sync'; import { UserInfoSS, UserInfoF, UserInfoDN } from '@ucap-webmessenger/protocol-query'; -import { BuiltinType } from '@angular/compiler'; +import { MatTabChangeEvent, MatTabGroup } from '@angular/material'; + +export enum MainMenu { + Group = 'GROUP', + Chat = 'CAHT', + Organization = 'ORGANIZATION', + Call = 'CALL', + Conversation = 'CONVERSATION' +} @Component({ selector: 'app-layout-messenger-left-side', @@ -33,8 +42,11 @@ export class LeftSideComponent implements OnInit { selectedUserList: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[] = []; /** FAB */ + fabButtonShow = true; fabButtons: { icon: string; tooltip?: string; divisionType?: string }[]; + MainMenu = MainMenu; + constructor( private store: Store, private dialogService: DialogService, @@ -45,18 +57,8 @@ export class LeftSideComponent implements OnInit { this.badgeChatUnReadCount$ = this.store.pipe( select(AppStore.MessengerSelector.SyncSelector.selectChatUnreadCount) ); - this.fabButtons = [ - { - icon: 'timer', - tooltip: 'New Timer Chat', - divisionType: 'NEW_TIMER_CHAT' - }, - { - icon: 'chat', - tooltip: 'New Chat', - divisionType: 'NEW_CHAT' - } - ]; + + this.setFabInitial(MainMenu.Group); } async onClickNewChat(type: string = 'NORMAL') { @@ -88,6 +90,89 @@ export class LeftSideComponent implements OnInit { } } + async onClickNewGroupAndMember() { + const result = await this.dialogService.open< + CreateChatDialogComponent, + CreateChatDialogData, + CreateChatDialogResult + >(CreateChatDialogComponent, { + width: '600px', + data: { + type: UserSelectDialogType.NewGroup, + title: 'New Group' + } + }); + + if (!!result && !!result.choice && result.choice) { + if ( + !!result.selectedUserList && + result.selectedUserList.length > 0 && + result.groupName.trim().length > 0 + ) { + const userSeqs: number[] = []; + result.selectedUserList.map(user => userSeqs.push(user.seq)); + + this.store.dispatch( + SyncStore.createGroupAndBuddy({ + groupName: result.groupName, + trgtUserSeq: userSeqs + }) + ); + } + } + } + + onSelectedTabChange(event: MatTabChangeEvent) { + this.setFabInitial(event.tab.ariaLabel); + } + setFabInitial(type: string) { + switch (type) { + case MainMenu.Group: + { + this.fabButtonShow = true; + this.fabButtons = [ + { + icon: 'add', + tooltip: 'New Group Add', + divisionType: 'GROUP_NEW_ADD' + } + ]; + } + break; + case MainMenu.Chat: + { + this.fabButtonShow = true; + this.fabButtons = [ + { + icon: 'timer', + tooltip: 'New Timer Chat', + divisionType: 'CHAT_NEW_TIMER_ADD' + }, + { + icon: 'chat', + tooltip: 'New Chat', + divisionType: 'CAHT_NEW_ADD' + } + ]; + } + break; + // case MainMenu.Organization: + // { + + // } + // break; + // case MainMenu.Call: + // { + + // } + // break; + + default: { + this.fabButtonShow = false; + } + } + } + onCheckAllUser(params: { isChecked: boolean; userInfos: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; @@ -137,12 +222,18 @@ export class LeftSideComponent implements OnInit { }; switch (btn.divisionType) { - case 'NEW_CHAT': + case 'GROUP_NEW_ADD': + { + this.onClickNewGroupAndMember(); + } + break; + + case 'CAHT_NEW_ADD': { this.onClickNewChat('NORMAL'); } break; - case 'NEW_TIMER_CHAT': + case 'CHAT_NEW_TIMER_ADD': { this.onClickNewChat('TIMER'); } 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 1fd8aee6..6f316a82 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 @@ -1,7 +1,12 @@ -import { StatusProtocolService } from './../../../../../../../ucap-webmessenger-protocol-status/src/lib/services/status-protocol.service'; -import { UserSelectDialogType } from './../../../../types/userselect.dialog.type'; import { MatMenuTrigger } from '@angular/material'; -import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; +import { + Component, + OnInit, + ViewChild, + OnDestroy, + EventEmitter, + Output +} from '@angular/core'; import { Observable, combineLatest, Subscription, of } from 'rxjs'; import { map, tap, catchError, exhaustMap } from 'rxjs/operators'; @@ -9,7 +14,6 @@ import { Store, select } from '@ngrx/store'; import * as AppStore from '@app/store'; import * as ChatStore from '@app/store/messenger/chat'; -import * as QueryStore from '@app/store/messenger/query'; import * as SyncStore from '@app/store/messenger/sync'; import * as StatusStore from '@app/store/messenger/status'; @@ -17,12 +21,13 @@ import { NGXLogger } from 'ngx-logger'; import { Company } from '@ucap-webmessenger/api-external'; import { SessionStorageService } from '@ucap-webmessenger/web-storage'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; -import { LoginInfo, KEY_LOGIN_INFO } from '@app/types'; +import { LoginInfo, KEY_LOGIN_INFO, UserSelectDialogType } from '@app/types'; import { KEY_VER_INFO } from '@app/types/ver-info.type'; import { ExpansionPanelComponent as GroupExpansionPanelComponent } from '@ucap-webmessenger/ui-group'; import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync'; +import { StatusProtocolService } from '@ucap-webmessenger/protocol-status'; import { DeptSearchType, UserInfoSS, @@ -59,6 +64,9 @@ import { animations: ucapAnimations }) export class GroupComponent implements OnInit, OnDestroy { + @Output() + newGroupAndMember = new EventEmitter(); + @ViewChild('groupExpansionPanel', { static: true }) groupExpansionPanel: GroupExpansionPanelComponent; @@ -164,35 +172,7 @@ export class GroupComponent implements OnInit, OnDestroy { switch (menuType) { case 'GROUP_NEW': { - const result = await this.dialogService.open< - CreateChatDialogComponent, - CreateChatDialogData, - CreateChatDialogResult - >(CreateChatDialogComponent, { - width: '600px', - data: { - type: UserSelectDialogType.NewGroup, - title: 'New Group' - } - }); - - if (!!result && !!result.choice && result.choice) { - if ( - !!result.selectedUserList && - result.selectedUserList.length > 0 && - result.groupName.trim().length > 0 - ) { - const userSeqs: number[] = []; - result.selectedUserList.map(user => userSeqs.push(user.seq)); - - this.store.dispatch( - SyncStore.createGroupAndBuddy({ - groupName: result.groupName, - trgtUserSeq: userSeqs - }) - ); - } - } + this.newGroupAndMember.emit(); } break; case 'GROUP_EXPAND_MORE': @@ -361,7 +341,6 @@ export class GroupComponent implements OnInit, OnDestroy { EditGroupDialogData, EditGroupDialogResult >(EditGroupDialogComponent, { - data: { title: 'Group Name Edit', group diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index bbd7ddcb..e11ac45e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -250,7 +250,6 @@ export class OrganizationComponent implements OnInit, OnDestroy { SelectGroupDialogResult >(SelectGroupDialogComponent, { width: '600px', - height: '500px', data: { title: 'Group Select' } diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index 65f730fd..e15413dd 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -1,4 +1,4 @@ -
+
@@ -10,7 +10,7 @@ [default]="defaultPath" /> - timer + timer