diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-28 01:10:26 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-28 01:10:26 +0100 |
commit | bf64ed4196938ba9002c887cadb01bd2a6e3127a (patch) | |
tree | 889b8f89c59cd513edd973785a76ccf6f8c23f3d /client/src/app/shared/video | |
parent | 71810d0bcbed0e46ddaa1d4eadd028154786fffb (diff) | |
download | PeerTube-bf64ed4196938ba9002c887cadb01bd2a6e3127a.tar.gz PeerTube-bf64ed4196938ba9002c887cadb01bd2a6e3127a.tar.zst PeerTube-bf64ed4196938ba9002c887cadb01bd2a6e3127a.zip |
Add search bars for a user's videos and playlist library
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r-- | client/src/app/shared/video/abstract-video-list.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/video/video-miniature.component.scss | 3 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index a2a12bec7..746359851 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts | |||
@@ -150,6 +150,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor | |||
150 | this.getVideosObservable(this.pagination.currentPage).subscribe( | 150 | this.getVideosObservable(this.pagination.currentPage).subscribe( |
151 | ({ data, total }) => { | 151 | ({ data, total }) => { |
152 | this.pagination.totalItems = total | 152 | this.pagination.totalItems = total |
153 | this.videos = [] | ||
153 | this.videos = this.videos.concat(data) | 154 | this.videos = this.videos.concat(data) |
154 | 155 | ||
155 | if (this.groupByDate) this.buildGroupedDateLabels() | 156 | if (this.groupByDate) this.buildGroupedDateLabels() |
@@ -170,7 +171,6 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor | |||
170 | 171 | ||
171 | reloadVideos () { | 172 | reloadVideos () { |
172 | this.pagination.currentPage = 1 | 173 | this.pagination.currentPage = 1 |
173 | this.videos = [] | ||
174 | this.loadMoreVideos() | 174 | this.loadMoreVideos() |
175 | } | 175 | } |
176 | 176 | ||
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 3988cc055..ac83c5dfa 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss | |||
@@ -100,7 +100,8 @@ $more-margin-right: 15px; | |||
100 | flex-direction: row; | 100 | flex-direction: row; |
101 | margin-bottom: 0; | 101 | margin-bottom: 0; |
102 | height: auto; | 102 | height: auto; |
103 | width: 100%; | 103 | display: flex; |
104 | flex-grow: 1; | ||
104 | 105 | ||
105 | my-video-thumbnail { | 106 | my-video-thumbnail { |
106 | margin-right: 10px; | 107 | margin-right: 10px; |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 9adf46495..2dd47d74e 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -121,14 +121,15 @@ export class VideoService implements VideosProvider { | |||
121 | .pipe(catchError(err => this.restExtractor.handleError(err))) | 121 | .pipe(catchError(err => this.restExtractor.handleError(err))) |
122 | } | 122 | } |
123 | 123 | ||
124 | getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<ResultList<Video>> { | 124 | getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField, search?: string): Observable<ResultList<Video>> { |
125 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 125 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
126 | 126 | ||
127 | let params = new HttpParams() | 127 | let params = new HttpParams() |
128 | params = this.restService.addRestGetParams(params, pagination, sort) | 128 | params = this.restService.addRestGetParams(params, pagination, sort) |
129 | params = this.restService.addObjectParams(params, { search }) | ||
129 | 130 | ||
130 | return this.authHttp | 131 | return this.authHttp |
131 | .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params }) | 132 | .get<ResultList<Video>>(UserService.BASE_USERS_URL + 'me/videos', { params }) |
132 | .pipe( | 133 | .pipe( |
133 | switchMap(res => this.extractVideos(res)), | 134 | switchMap(res => this.extractVideos(res)), |
134 | catchError(err => this.restExtractor.handleError(err)) | 135 | catchError(err => this.restExtractor.handleError(err)) |