diff options
author | Dimitri Gilbert <dimitri.gilbert@gmail.com> | 2018-01-25 18:40:23 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-25 18:40:23 +0100 |
commit | 529479f924b1849423fb087f9699f8ecb20610ca (patch) | |
tree | 3d65b27cb34f3cc187c1bb3af867b254166fee2e | |
parent | c360c49456a27529268722fb7c645819cff59486 (diff) | |
download | PeerTube-529479f924b1849423fb087f9699f8ecb20610ca.tar.gz PeerTube-529479f924b1849423fb087f9699f8ecb20610ca.tar.zst PeerTube-529479f924b1849423fb087f9699f8ecb20610ca.zip |
Issue #195 : When uploading, warn when the user quits the page (#222)
* issue #195
* fixing missing provider definition
* fix styling issue
* fix styling issue
* removed unecessary code
* using angular confirmService instead of window.confirm
* gitignore unecessary folders
* style fixes
* using a generic canDeactivateGuard
* fixing lint style
4 files changed, 38 insertions, 6 deletions
diff --git a/client/src/app/shared/can-deactivate-guard.service.ts b/client/src/app/shared/can-deactivate-guard.service.ts new file mode 100644 index 000000000..4239df737 --- /dev/null +++ b/client/src/app/shared/can-deactivate-guard.service.ts | |||
@@ -0,0 +1,25 @@ | |||
1 | import { Injectable } from '@angular/core' | ||
2 | import { CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router' | ||
3 | import { Observable } from 'rxjs/Observable' | ||
4 | import { ConfirmService } from '../core' | ||
5 | |||
6 | export interface CanComponentDeactivate { | ||
7 | canDeactivate: () => Observable<boolean> | boolean | ||
8 | } | ||
9 | |||
10 | @Injectable() | ||
11 | export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate> { | ||
12 | constructor (private confirmService: ConfirmService) { } | ||
13 | |||
14 | canDeactivate (component: CanComponentDeactivate, | ||
15 | currentRoute: ActivatedRouteSnapshot, | ||
16 | currentState: RouterStateSnapshot, | ||
17 | nextState: RouterStateSnapshot | ||
18 | ): Observable<boolean> | boolean { | ||
19 | return component.canDeactivate() || this.confirmService.confirm( | ||
20 | 'All unsaved data will be lost, are you sure you want to leave ?', | ||
21 | 'Unsaved Data' | ||
22 | ) | ||
23 | } | ||
24 | |||
25 | } | ||
diff --git a/client/src/app/videos/+video-edit/video-add-routing.module.ts b/client/src/app/videos/+video-edit/video-add-routing.module.ts index e7a32627c..9541a2bd1 100644 --- a/client/src/app/videos/+video-edit/video-add-routing.module.ts +++ b/client/src/app/videos/+video-edit/video-add-routing.module.ts | |||
@@ -4,13 +4,15 @@ import { RouterModule, Routes } from '@angular/router' | |||
4 | import { MetaGuard } from '@ngx-meta/core' | 4 | import { MetaGuard } from '@ngx-meta/core' |
5 | 5 | ||
6 | import { LoginGuard } from '../../core' | 6 | import { LoginGuard } from '../../core' |
7 | import { CanDeactivateGuard } from '../../shared/can-deactivate-guard.service' | ||
7 | import { VideoAddComponent } from './video-add.component' | 8 | import { VideoAddComponent } from './video-add.component' |
8 | 9 | ||
9 | const videoAddRoutes: Routes = [ | 10 | const videoAddRoutes: Routes = [ |
10 | { | 11 | { |
11 | path: '', | 12 | path: '', |
12 | component: VideoAddComponent, | 13 | component: VideoAddComponent, |
13 | canActivate: [ MetaGuard, LoginGuard ] | 14 | canActivate: [ MetaGuard, LoginGuard ], |
15 | canDeactivate: [CanDeactivateGuard] | ||
14 | } | 16 | } |
15 | ] | 17 | ] |
16 | 18 | ||
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts index 73efd60bf..58eccef48 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts | |||
@@ -12,6 +12,7 @@ import { ValidatorMessage } from '../../shared/forms/form-validators/validator-m | |||
12 | import { populateAsyncUserVideoChannels } from '../../shared/misc/utils' | 12 | import { populateAsyncUserVideoChannels } from '../../shared/misc/utils' |
13 | import { VideoEdit } from '../../shared/video/video-edit.model' | 13 | import { VideoEdit } from '../../shared/video/video-edit.model' |
14 | import { VideoService } from '../../shared/video/video.service' | 14 | import { VideoService } from '../../shared/video/video.service' |
15 | import { CanComponentDeactivate } from '@app/shared/can-deactivate-guard.service' | ||
15 | 16 | ||
16 | @Component({ | 17 | @Component({ |
17 | selector: 'my-videos-add', | 18 | selector: 'my-videos-add', |
@@ -22,7 +23,7 @@ import { VideoService } from '../../shared/video/video.service' | |||
22 | ] | 23 | ] |
23 | }) | 24 | }) |
24 | 25 | ||
25 | export class VideoAddComponent extends FormReactive implements OnInit { | 26 | export class VideoAddComponent extends FormReactive implements OnInit, CanComponentDeactivate { |
26 | @ViewChild('videofileInput') videofileInput | 27 | @ViewChild('videofileInput') videofileInput |
27 | 28 | ||
28 | isUploadingVideo = false | 29 | isUploadingVideo = false |
@@ -84,6 +85,10 @@ export class VideoAddComponent extends FormReactive implements OnInit { | |||
84 | }) | 85 | }) |
85 | } | 86 | } |
86 | 87 | ||
88 | canDeactivate () { | ||
89 | return !this.isUploadingVideo | ||
90 | } | ||
91 | |||
87 | fileChange () { | 92 | fileChange () { |
88 | this.uploadFirstStep() | 93 | this.uploadFirstStep() |
89 | } | 94 | } |
diff --git a/client/src/app/videos/+video-edit/video-add.module.ts b/client/src/app/videos/+video-edit/video-add.module.ts index 1efecdf4d..af9696a03 100644 --- a/client/src/app/videos/+video-edit/video-add.module.ts +++ b/client/src/app/videos/+video-edit/video-add.module.ts | |||
@@ -4,6 +4,7 @@ import { SharedModule } from '../../shared' | |||
4 | import { VideoEditModule } from './shared/video-edit.module' | 4 | import { VideoEditModule } from './shared/video-edit.module' |
5 | import { VideoAddRoutingModule } from './video-add-routing.module' | 5 | import { VideoAddRoutingModule } from './video-add-routing.module' |
6 | import { VideoAddComponent } from './video-add.component' | 6 | import { VideoAddComponent } from './video-add.component' |
7 | import { CanDeactivateGuard } from '../../shared/can-deactivate-guard.service' | ||
7 | 8 | ||
8 | @NgModule({ | 9 | @NgModule({ |
9 | imports: [ | 10 | imports: [ |
@@ -12,15 +13,14 @@ import { VideoAddComponent } from './video-add.component' | |||
12 | SharedModule, | 13 | SharedModule, |
13 | ProgressBarModule | 14 | ProgressBarModule |
14 | ], | 15 | ], |
15 | |||
16 | declarations: [ | 16 | declarations: [ |
17 | VideoAddComponent | 17 | VideoAddComponent |
18 | ], | 18 | ], |
19 | |||
20 | exports: [ | 19 | exports: [ |
21 | VideoAddComponent | 20 | VideoAddComponent |
22 | ], | 21 | ], |
23 | 22 | providers: [ | |
24 | providers: [ ] | 23 | CanDeactivateGuard |
24 | ] | ||
25 | }) | 25 | }) |
26 | export class VideoAddModule { } | 26 | export class VideoAddModule { } |