X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fusers%2Fuser-list%2Fuser-list.component.ts;h=339e182067c4610febaaddc509fe3570e4167308;hb=931d3430184143ebd88e5243def6eb1d7acfdbf4;hp=33384dc35083c8b7b9542e075d841fb53475df97;hpb=24b9417cec5cc785a57b2fe169a1ae88b88801a4;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 33384dc35..339e18206 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,12 +1,17 @@ +import { SortMeta } from 'primeng/api' import { Component, OnInit, ViewChild } from '@angular/core' -import { NotificationsService } from 'angular2-notifications' -import { SortMeta } from 'primeng/components/common/sortmeta' -import { ConfirmService } from '../../../core' -import { RestPagination, RestTable, UserService } from '../../../shared' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { User } from '../../../../../../shared' -import { UserBanModalComponent } from '@app/shared/moderation' -import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' +import { ActivatedRoute, Params, Router } from '@angular/router' +import { AuthService, ConfirmService, Notifier, RestPagination, RestTable, ServerService, UserService } from '@app/core' +import { Account, DropdownAction } from '@app/shared/shared-main' +import { UserBanModalComponent } from '@app/shared/shared-moderation' +import { ServerConfig, User, UserRole } from '@shared/models' + +type UserForList = User & { + rawVideoQuota: number + rawVideoQuotaUsed: number + rawVideoQuotaDaily: number + rawVideoQuotaUsedDaily: number +} @Component({ selector: 'my-user-list', @@ -14,65 +19,139 @@ 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 - rowsPerPage = 10 sort: SortMeta = { field: 'createdAt', order: 1 } pagination: RestPagination = { count: this.rowsPerPage, start: 0 } + highlightBannedUsers = false selectedUsers: User[] = [] - bulkUserActions: DropdownAction[] = [] + bulkUserActions: DropdownAction[][] = [] + columns: { id: string, label: string }[] + + private _selectedColumns: string[] + private serverConfig: ServerConfig constructor ( - private notificationsService: NotificationsService, + protected route: ActivatedRoute, + protected router: Router, + private notifier: Notifier, private confirmService: ConfirmService, - private userService: UserService, - private i18n: I18n + private serverService: ServerService, + private auth: AuthService, + private userService: UserService ) { super() } + get authUser () { + return this.auth.getUser() + } + + get requiresEmailVerification () { + return this.serverConfig.signup.requiresEmailVerification + } + + get selectedColumns () { + return this._selectedColumns + } + + set selectedColumns (val: string[]) { + this._selectedColumns = val + } + ngOnInit () { + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => this.serverConfig = config) + this.initialize() + this.listenToSearchChange() 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: $localize`Delete`, + description: $localize`Videos will be deleted, comments will be tombstoned.`, + handler: users => this.removeUsers(users), + isDisplayed: users => users.every(u => this.authUser.canManage(u)) + }, + { + label: $localize`Ban`, + description: $localize`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: $localize`Unban`, + handler: users => this.unbanUsers(users), + isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === true) + } + ], + [ + { + label: $localize`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) + } + } + ] + ] + + this.columns = [ + { id: 'username', label: 'Username' }, + { id: 'email', label: 'Email' }, + { id: 'quota', label: 'Video quota' }, + { id: 'role', label: 'Role' }, + { id: 'createdAt', label: 'Created' } ] + + this.selectedColumns = this.columns.map(c => c.id) + + this.columns.push({ id: 'quotaDaily', label: 'Daily quota' }) + this.columns.push({ id: 'pluginAuth', label: 'Auth plugin' }) + this.columns.push({ id: 'lastLoginDate', label: 'Last login' }) } - protected loadData () { - this.selectedUsers = [] + getIdentifier () { + return 'UserListComponent' + } - this.userService.getUsers(this.pagination, this.sort, this.search) - .subscribe( - resultList => { - this.users = resultList.data - this.totalRecords = resultList.total - }, + getRoleClass (role: UserRole) { + switch (role) { + case UserRole.ADMINISTRATOR: + return 'badge-purple' + case UserRole.MODERATOR: + return 'badge-blue' + default: + return 'badge-yellow' + } + } - err => this.notificationsService.error(this.i18n('Error'), err.message) - ) + isSelected (id: string) { + return this.selectedColumns.find(c => c === id) + } + + getColumn (id: string) { + return this.columns.find(c => c.id === id) + } + + getUserVideoQuotaPercentage (user: UserForList) { + return user.rawVideoQuotaUsed * 100 / user.rawVideoQuota + } + + getUserVideoQuotaDailyPercentage (user: UserForList) { + return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily } openBanUserModal (users: User[]) { for (const user of users) { if (user.username === 'root') { - this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot ban root.')) + this.notifier.error($localize`You cannot ban root.`) return } } @@ -80,55 +159,76 @@ export class UserListComponent extends RestTable implements OnInit { this.userBanModal.openModal(users) } - onUsersBanned () { + onUserChanged () { this.loadData() } async unbanUsers (users: User[]) { - const message = this.i18n('Do you really want to unban {{num}} users?', { num: users.length }) - - const res = await this.confirmService.confirm(message, this.i18n('Unban')) + const res = await this.confirmService.confirm($localize`Do you really want to unban ${users.length} users?`, $localize`Unban`) if (res === false) return this.userService.unbanUsers(users) .subscribe( () => { - const message = this.i18n('{{num}} users unbanned.', { num: users.length }) - - this.notificationsService.success(this.i18n('Success'), message) + this.notifier.success($localize`${users.length} users unbanned.`) this.loadData() }, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) ) } async removeUsers (users: User[]) { for (const user of users) { if (user.username === 'root') { - this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot delete root.')) + this.notifier.error($localize`You cannot delete root.`) return } } - const message = this.i18n('If you remove these users, you will not be able to create others with the same username!') - const res = await this.confirmService.confirm(message, this.i18n('Delete')) + const message = $localize`If you remove these users, you will not be able to create others with the same username!` + const res = await this.confirmService.confirm(message, $localize`Delete`) if (res === false) return this.userService.removeUser(users).subscribe( () => { - this.notificationsService.success( - this.i18n('Success'), - this.i18n('{{num}} users deleted.', { num: users.length }) - ) + this.notifier.success($localize`${users.length} users deleted.`) this.loadData() }, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) + ) + } + + async setEmailsAsVerified (users: User[]) { + this.userService.updateUsers(users, { emailVerified: true }).subscribe( + () => { + this.notifier.success($localize`${users.length} users email set as verified.`) + this.loadData() + }, + + err => this.notifier.error(err.message) ) } isInSelectionMode () { return this.selectedUsers.length !== 0 } + + protected loadData () { + this.selectedUsers = [] + + this.userService.getUsers({ + pagination: this.pagination, + sort: this.sort, + search: this.search + }).subscribe( + resultList => { + this.users = resultList.data + this.totalRecords = resultList.total + }, + + err => this.notifier.error(err.message) + ) + } }