X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fusers%2Fuser-list%2Fuser-list.component.ts;h=6e9a1fedacfeb7c1392b713bd85d6014e3db1ae8;hb=f77eb73b5e02bed9e223dafc1c203ceb7c05b6e5;hp=66ab796f9bee2af8270663cf9710fbfc12b9a685;hpb=88108880bbdba473cfe36ecbebc1c3c4f972e102;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 66ab796f9..6e9a1feda 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit, ViewChild } from '@angular/core' -import { Notifier } from '@app/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { AuthService, Notifier } from '@app/core' +import { SortMeta } from 'primeng/api' import { ConfirmService, ServerService } from '../../../core' import { RestPagination, RestTable, UserService } from '../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' -import { User } from '../../../../../../shared' +import { ServerConfig, User } from '../../../../../../shared' import { UserBanModalComponent } from '@app/shared/moderation' import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' @@ -14,7 +14,7 @@ import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' styleUrls: [ './user-list.component.scss' ] }) export class UserListComponent extends RestTable implements OnInit { - @ViewChild('userBanModal') userBanModal: UserBanModalComponent + @ViewChild('userBanModal', { static: true }) userBanModal: UserBanModalComponent users: User[] = [] totalRecords = 0 @@ -23,45 +23,66 @@ export class UserListComponent extends RestTable implements OnInit { pagination: RestPagination = { count: this.rowsPerPage, start: 0 } selectedUsers: User[] = [] - bulkUserActions: DropdownAction[] = [] + bulkUserActions: DropdownAction[][] = [] + + private serverConfig: ServerConfig constructor ( private notifier: Notifier, private confirmService: ConfirmService, private serverService: ServerService, private userService: UserService, + private auth: AuthService, private i18n: I18n ) { super() } + get authUser () { + return this.auth.getUser() + } + get requiresEmailVerification () { - return this.serverService.getConfig().signup.requiresEmailVerification + return this.serverConfig.signup.requiresEmailVerification } ngOnInit () { + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => this.serverConfig = config) + this.initialize() this.bulkUserActions = [ - { - label: this.i18n('Delete'), - handler: users => this.removeUsers(users) - }, - { - label: this.i18n('Ban'), - handler: users => this.openBanUserModal(users), - isDisplayed: users => users.every(u => u.blocked === false) - }, - { - label: this.i18n('Unban'), - handler: users => this.unbanUsers(users), - isDisplayed: users => users.every(u => u.blocked === true) - }, - { - label: this.i18n('Set Email as Verified'), - handler: users => this.setEmailsAsVerified(users), - isDisplayed: users => this.requiresEmailVerification && users.every(u => !u.blocked && u.emailVerified === false) - } + [ + { + label: this.i18n('Delete'), + description: this.i18n('Videos will be deleted, comments will be tombstoned.'), + handler: users => this.removeUsers(users), + isDisplayed: users => users.every(u => this.authUser.canManage(u)) + }, + { + label: this.i18n('Ban'), + description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'), + handler: users => this.openBanUserModal(users), + isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === false) + }, + { + label: this.i18n('Unban'), + handler: users => this.unbanUsers(users), + isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === true) + } + ], + [ + { + label: this.i18n('Set Email as Verified'), + handler: users => this.setEmailsAsVerified(users), + isDisplayed: users => { + return this.requiresEmailVerification && + users.every(u => this.authUser.canManage(u) && !u.blocked && u.emailVerified === false) + } + } + ] ] }