diff --git a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts index 84964c7b..e905272b 100644 --- a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts +++ b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts @@ -5,6 +5,8 @@ import { app, BrowserWindow, screen, ipcMain, IpcMainEvent } from 'electron'; import windowStateKeeper from 'electron-window-state'; import { EventEmitter } from 'events'; +import log from 'electron-log'; + import { registerWindowStateChangedEvents } from '../lib/window-state'; import { ElectronAppChannel, @@ -164,10 +166,30 @@ export class AppWindow { } ); - this.window.webContents.on(ElectronWebContentsChannel.DidFailLoad, () => { - this.window.webContents.openDevTools(); - this.window.show(); - }); + this.window.webContents.on( + ElectronWebContentsChannel.DidFailLoad, + ( + event: Event, + errorCode: number, + errorDescription: string, + validatedURL: string, + isMainFrame: boolean + ) => { + if ('ERR_FILE_NOT_FOUND' === errorDescription) { + this.load(); + return; + } + log.error( + ElectronWebContentsChannel.DidFailLoad, + event, + errorCode, + errorDescription, + validatedURL, + isMainFrame + ); + this.window.webContents.openDevTools(); + } + ); registerWindowStateChangedEvents(this.window); diff --git a/package.json b/package.json index d157e143..0f68f00a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucap-webmessenger", - "version": "0.0.16", + "version": "0.0.17", "author": { "name": "LG CNS", "email": "lgucap@lgcns.com" diff --git a/projects/ucap-webmessenger-app/src/app/app-routing.module.ts b/projects/ucap-webmessenger-app/src/app/app-routing.module.ts index 99fef86b..e27fc322 100644 --- a/projects/ucap-webmessenger-app/src/app/app-routing.module.ts +++ b/projects/ucap-webmessenger-app/src/app/app-routing.module.ts @@ -10,26 +10,26 @@ const routes: Routes = [ import('./pages/messenger/messenger.page.module').then( m => m.AppMessengerPageModule ), - canActivate: [AppAuthGuard], + canActivate: [AppAuthGuard] }, { path: 'account', loadChildren: () => import('./pages/account/account.page.module').then( m => m.AppAccountPageModule - ), + ) }, { path: 'template', loadChildren: () => import('./pages/template/template.page.module').then( m => m.AppTemplatePageModule - ), - }, + ) + } ]; @NgModule({ imports: [RouterModule.forRoot(routes, { enableTracing: false })], - exports: [RouterModule], + exports: [RouterModule] }) export class AppRoutingModule {} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html index f1baab99..1eb48dd9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html @@ -50,46 +50,37 @@
- - - - - +
- - - + +
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 fd88af46..f65994b6 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 @@ -10,7 +10,13 @@ import { ChangeDetectorRef } from '@angular/core'; import { ucapAnimations, DialogService } from '@ucap-webmessenger/ui'; -import { Observable, Subscription, of } from 'rxjs'; +import { + Observable, + Subscription, + of, + BehaviorSubject, + combineLatest +} from 'rxjs'; import { DeptInfo, QueryProtocolService, @@ -40,7 +46,8 @@ import { KEY_VER_INFO, EnvironmentsInfo, KEY_ENVIRONMENTS_INFO, - KEY_AUTH_INFO + KEY_AUTH_INFO, + MainMenu } from '@app/types'; import { take, map, tap, delay, catchError } from 'rxjs/operators'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; @@ -154,6 +161,11 @@ export class OrganizationComponent isShowSearch = false; searchUserInfos: UserInfoSS[] = []; + organizationTreeActivatedSubject: BehaviorSubject< + boolean + > = new BehaviorSubject(false); + organizationTreeActivatedSubscription: Subscription; + /** 부서원 리스트에 virture scroll의 size 가 체킹되지 않아 강제 수행. 1번만. */ isInitList = false; @@ -256,6 +268,21 @@ export class OrganizationComponent this.psDirectiveRef.update(); } }); + + this.organizationTreeActivatedSubscription = combineLatest([ + this.store.pipe( + select(AppStore.MessengerSelector.SettingsSelector.gnbMenuIndex) + ), + this.store.pipe( + select( + AppStore.MessengerSelector.SettingsSelector.organizationTreeActivated + ) + ) + ]).subscribe(([menu, activate]) => { + this.organizationTreeActivatedSubject.next( + menu === MainMenu.Organization || activate + ); + }); } ngAfterViewChecked(): void { @@ -277,6 +304,9 @@ export class OrganizationComponent if (!!this.myDepartmentUserInfoListSubscription) { this.myDepartmentUserInfoListSubscription.unsubscribe(); } + if (!!this.organizationTreeActivatedSubscription) { + this.organizationTreeActivatedSubscription.unsubscribe(); + } } /** 유저검색 */ 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 04d87cf1..27f3229a 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 @@ -154,7 +154,7 @@ >
-
+
- {{ 'common.file.errors.cantPlay' | translate }} +
+ + + + {{ 'common.file.errors.cantPlay' | translate }} +