aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-10-14 11:50:22 +0200
committerChocobozzz <me@florianbigard.com>2021-10-14 11:50:22 +0200
commitafb7d2d5c6ca09d2c678781ae4dd3f527604c1b4 (patch)
treee0b9c2039c541f5866c596b1531f820fc938ca50 /client/src/app/shared
parent37cd44d04f2ad4d90535d28340c78d8d85b31f18 (diff)
downloadPeerTube-afb7d2d5c6ca09d2c678781ae4dd3f527604c1b4.tar.gz
PeerTube-afb7d2d5c6ca09d2c678781ae4dd3f527604c1b4.tar.zst
PeerTube-afb7d2d5c6ca09d2c678781ae4dd3f527604c1b4.zip
Remove protractor workaround
We don't use it anymore
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/shared-search/find-in-bulk.service.ts6
-rw-r--r--client/src/app/shared/shared-user-subscription/user-subscription.service.ts6
-rw-r--r--client/src/app/shared/shared-video-playlist/video-playlist.service.ts6
3 files changed, 6 insertions, 12 deletions
diff --git a/client/src/app/shared/shared-search/find-in-bulk.service.ts b/client/src/app/shared/shared-search/find-in-bulk.service.ts
index 962e374a5..6d77941d3 100644
--- a/client/src/app/shared/shared-search/find-in-bulk.service.ts
+++ b/client/src/app/shared/shared-search/find-in-bulk.service.ts
@@ -1,7 +1,7 @@
1import * as debug from 'debug' 1import * as debug from 'debug'
2import { Observable, Subject } from 'rxjs' 2import { Observable, Subject } from 'rxjs'
3import { first, map } from 'rxjs/operators' 3import { first, map } from 'rxjs/operators'
4import { Injectable, NgZone } from '@angular/core' 4import { Injectable } from '@angular/core'
5import { buildBulkObservable } from '@app/helpers' 5import { buildBulkObservable } from '@app/helpers'
6import { ResultList } from '@shared/models/common' 6import { ResultList } from '@shared/models/common'
7import { Video, VideoChannel } from '../shared-main' 7import { Video, VideoChannel } from '../shared-main'
@@ -23,8 +23,7 @@ export class FindInBulkService {
23 private getPlaylistInBulk: BulkObservables<string, ResultList<VideoPlaylist>> 23 private getPlaylistInBulk: BulkObservables<string, ResultList<VideoPlaylist>>
24 24
25 constructor ( 25 constructor (
26 private searchService: SearchService, 26 private searchService: SearchService
27 private ngZone: NgZone
28 ) { 27 ) {
29 this.getVideoInBulk = this.buildBulkObservableObject(this.getVideosInBulk.bind(this)) 28 this.getVideoInBulk = this.buildBulkObservableObject(this.getVideosInBulk.bind(this))
30 this.getChannelInBulk = this.buildBulkObservableObject(this.getChannelsInBulk.bind(this)) 29 this.getChannelInBulk = this.buildBulkObservableObject(this.getChannelsInBulk.bind(this))
@@ -115,7 +114,6 @@ export class FindInBulkService {
115 result: buildBulkObservable({ 114 result: buildBulkObservable({
116 time: 500, 115 time: 500,
117 bulkGet, 116 bulkGet,
118 ngZone: this.ngZone,
119 notifierObservable: notifier.asObservable() 117 notifierObservable: notifier.asObservable()
120 }) 118 })
121 } 119 }
diff --git a/client/src/app/shared/shared-user-subscription/user-subscription.service.ts b/client/src/app/shared/shared-user-subscription/user-subscription.service.ts
index e4fc09b36..8d2de8173 100644
--- a/client/src/app/shared/shared-user-subscription/user-subscription.service.ts
+++ b/client/src/app/shared/shared-user-subscription/user-subscription.service.ts
@@ -2,7 +2,7 @@ import * as debug from 'debug'
2import { merge, Observable, of, ReplaySubject, Subject } from 'rxjs' 2import { merge, Observable, of, ReplaySubject, Subject } from 'rxjs'
3import { catchError, filter, map, switchMap, tap } from 'rxjs/operators' 3import { catchError, filter, map, switchMap, tap } from 'rxjs/operators'
4import { HttpClient, HttpParams } from '@angular/common/http' 4import { HttpClient, HttpParams } from '@angular/common/http'
5import { Injectable, NgZone } from '@angular/core' 5import { Injectable } from '@angular/core'
6import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' 6import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core'
7import { buildBulkObservable } from '@app/helpers' 7import { buildBulkObservable } from '@app/helpers'
8import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' 8import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
@@ -30,13 +30,11 @@ export class UserSubscriptionService {
30 private authHttp: HttpClient, 30 private authHttp: HttpClient,
31 private restExtractor: RestExtractor, 31 private restExtractor: RestExtractor,
32 private videoService: VideoService, 32 private videoService: VideoService,
33 private restService: RestService, 33 private restService: RestService
34 private ngZone: NgZone
35 ) { 34 ) {
36 this.existsObservable = merge( 35 this.existsObservable = merge(
37 buildBulkObservable({ 36 buildBulkObservable({
38 time: 500, 37 time: 500,
39 ngZone: this.ngZone,
40 notifierObservable: this.existsSubject, 38 notifierObservable: this.existsSubject,
41 bulkGet: this.doSubscriptionsExist.bind(this) 39 bulkGet: this.doSubscriptionsExist.bind(this)
42 }), 40 }),
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts
index 76835b9fc..02632c9eb 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts
@@ -2,7 +2,7 @@ import * as debug from 'debug'
2import { merge, Observable, of, ReplaySubject, Subject } from 'rxjs' 2import { merge, Observable, of, ReplaySubject, Subject } from 'rxjs'
3import { catchError, filter, map, share, switchMap, tap } from 'rxjs/operators' 3import { catchError, filter, map, share, switchMap, tap } from 'rxjs/operators'
4import { HttpClient, HttpParams } from '@angular/common/http' 4import { HttpClient, HttpParams } from '@angular/common/http'
5import { Injectable, NgZone } from '@angular/core' 5import { Injectable } from '@angular/core'
6import { AuthUser, ComponentPaginationLight, RestExtractor, RestService, ServerService } from '@app/core' 6import { AuthUser, ComponentPaginationLight, RestExtractor, RestService, ServerService } from '@app/core'
7import { buildBulkObservable, objectToFormData } from '@app/helpers' 7import { buildBulkObservable, objectToFormData } from '@app/helpers'
8import { Account, AccountService, VideoChannel, VideoChannelService } from '@app/shared/shared-main' 8import { Account, AccountService, VideoChannel, VideoChannelService } from '@app/shared/shared-main'
@@ -47,13 +47,11 @@ export class VideoPlaylistService {
47 private authHttp: HttpClient, 47 private authHttp: HttpClient,
48 private serverService: ServerService, 48 private serverService: ServerService,
49 private restExtractor: RestExtractor, 49 private restExtractor: RestExtractor,
50 private restService: RestService, 50 private restService: RestService
51 private ngZone: NgZone
52 ) { 51 ) {
53 this.videoExistsInPlaylistObservable = merge( 52 this.videoExistsInPlaylistObservable = merge(
54 buildBulkObservable({ 53 buildBulkObservable({
55 time: 500, 54 time: 500,
56 ngZone: this.ngZone,
57 bulkGet: this.doVideosExistInPlaylist.bind(this), 55 bulkGet: this.doVideosExistInPlaylist.bind(this),
58 notifierObservable: this.videoExistsInPlaylistNotifier 56 notifierObservable: this.videoExistsInPlaylistNotifier
59 }), 57 }),