X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Ffollows%2Ffollowers-list%2Ffollowers-list.component.ts;h=329e3bcc7071bd0ace53255f541deec7f90cd487;hb=eeae81428e933b923dc9d9b6c9ce5c9fcf0de1a7;hp=b78cdf656edfd76b3f2c94d341dd87c72553ced0;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts index b78cdf656..329e3bcc7 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts @@ -1,10 +1,8 @@ +import { SortMeta } from 'primeng/api' import { Component, OnInit } from '@angular/core' -import { ConfirmService, Notifier } from '@app/core' -import { SortMeta } from 'primeng/primeng' -import { ActorFollow } from '../../../../../../shared/models/actors/follow.model' -import { RestPagination, RestTable } from '../../../shared' -import { FollowService } from '../shared' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' +import { InstanceFollowService } from '@app/shared/shared-instance' +import { ActorFollow } from '@shared/models' @Component({ selector: 'my-followers-list', @@ -14,15 +12,13 @@ import { I18n } from '@ngx-translate/i18n-polyfill' export class FollowersListComponent extends RestTable implements OnInit { followers: ActorFollow[] = [] totalRecords = 0 - rowsPerPage = 10 - sort: SortMeta = { field: 'createdAt', order: 1 } + sort: SortMeta = { field: 'createdAt', order: -1 } pagination: RestPagination = { count: this.rowsPerPage, start: 0 } constructor ( private confirmService: ConfirmService, private notifier: Notifier, - private i18n: I18n, - private followService: FollowService + private followService: InstanceFollowService ) { super() } @@ -31,71 +27,75 @@ export class FollowersListComponent extends RestTable implements OnInit { this.initialize() } + getIdentifier () { + return 'FollowersListComponent' + } + acceptFollower (follow: ActorFollow) { follow.state = 'accepted' this.followService.acceptFollower(follow) - .subscribe( - () => { + .subscribe({ + next: () => { const handle = follow.follower.name + '@' + follow.follower.host - this.notifier.success(this.i18n('{{handle}} accepted in instance followers', { handle })) + this.notifier.success($localize`${handle} accepted in instance followers`) }, - err => { + error: err => { follow.state = 'pending' this.notifier.error(err.message) } - ) + }) } async rejectFollower (follow: ActorFollow) { - const message = this.i18n('Do you really want to reject this follower?') - const res = await this.confirmService.confirm(message, this.i18n('Reject')) + const message = $localize`Do you really want to reject this follower?` + const res = await this.confirmService.confirm(message, $localize`Reject`) if (res === false) return this.followService.rejectFollower(follow) - .subscribe( - () => { + .subscribe({ + next: () => { const handle = follow.follower.name + '@' + follow.follower.host - this.notifier.success(this.i18n('{{handle}} rejected from instance followers', { handle })) + this.notifier.success($localize`${handle} rejected from instance followers`) - this.loadData() + this.reloadData() }, - err => { + error: err => { follow.state = 'pending' this.notifier.error(err.message) } - ) + }) } async deleteFollower (follow: ActorFollow) { - const message = this.i18n('Do you really want to delete this follower?') - const res = await this.confirmService.confirm(message, this.i18n('Delete')) + const message = $localize`Do you really want to delete this follower?` + const res = await this.confirmService.confirm(message, $localize`Delete`) if (res === false) return this.followService.removeFollower(follow) - .subscribe( - () => { + .subscribe({ + next: () => { const handle = follow.follower.name + '@' + follow.follower.host - this.notifier.success(this.i18n('{{handle}} removed from instance followers', { handle })) + this.notifier.success($localize`${handle} removed from instance followers`) - this.loadData() + this.reloadData() }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } - protected loadData () { - this.followService.getFollowers(this.pagination, this.sort, this.search) - .subscribe( - resultList => { + protected reloadData () { + this.followService.getFollowers({ pagination: this.pagination, sort: this.sort, search: this.search }) + .subscribe({ + next: resultList => { this.followers = resultList.data this.totalRecords = resultList.total }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } }