From 228393302d98136d4dc35c5f197edc8cebd5d64f Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 15 Jun 2020 13:18:22 +0200 Subject: factorize account/server blocklists for users and instance (#2875) --- .../my-account-blocklist.component.ts | 56 +++------------------- 1 file changed, 6 insertions(+), 50 deletions(-) (limited to 'client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts') diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts index fd1fabcdb..e48c39cdf 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts +++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts @@ -1,59 +1,15 @@ -import { Component, OnInit } from '@angular/core' -import { Notifier } from '@app/core' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/api' -import { AccountBlock, BlocklistService } from '@app/shared/blocklist' +import { Component } from '@angular/core' +import { GenericAccountBlocklistComponent, BlocklistComponentType } from '@app/shared/blocklist' @Component({ selector: 'my-account-blocklist', - styleUrls: [ './my-account-blocklist.component.scss' ], - templateUrl: './my-account-blocklist.component.html' + styleUrls: [ '../../shared/blocklist/account-blocklist.component.scss' ], + templateUrl: '../../shared/blocklist/account-blocklist.component.html' }) -export class MyAccountBlocklistComponent extends RestTable implements OnInit { - blockedAccounts: AccountBlock[] = [] - totalRecords = 0 - sort: SortMeta = { field: 'createdAt', order: -1 } - pagination: RestPagination = { count: this.rowsPerPage, start: 0 } - - constructor ( - private notifier: Notifier, - private blocklistService: BlocklistService, - private i18n: I18n - ) { - super() - } - - ngOnInit () { - this.initialize() - } +export class MyAccountBlocklistComponent extends GenericAccountBlocklistComponent { + mode = BlocklistComponentType.Account getIdentifier () { return 'MyAccountBlocklistComponent' } - - unblockAccount (accountBlock: AccountBlock) { - const blockedAccount = accountBlock.blockedAccount - - this.blocklistService.unblockAccountByUser(blockedAccount) - .subscribe( - () => { - this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: blockedAccount.nameWithHost })) - - this.loadData() - } - ) - } - - protected loadData () { - return this.blocklistService.getUserAccountBlocklist(this.pagination, this.sort) - .subscribe( - resultList => { - this.blockedAccounts = resultList.data - this.totalRecords = resultList.total - }, - - err => this.notifier.error(err.message) - ) - } } -- cgit v1.2.3