diff options
Diffstat (limited to 'client/src/app/+admin/users/user-list')
3 files changed, 177 insertions, 22 deletions
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index cca057ba1..69a4616a3 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <div i18n class="form-sub-title">Users list</div> | 2 | <div i18n class="form-sub-title">Users list</div> |
3 | 3 | ||
4 | <a class="add-button" routerLink="/admin/users/create"> | 4 | <a class="add-button" routerLink="/admin/users/create"> |
5 | <span class="icon icon-add"></span> | 5 | <my-global-icon iconName="add"></my-global-icon> |
6 | <ng-container i18n>Create user</ng-container> | 6 | <ng-container i18n>Create user</ng-container> |
7 | </a> | 7 | </a> |
8 | </div> | 8 | </div> |
@@ -10,9 +10,32 @@ | |||
10 | <p-table | 10 | <p-table |
11 | [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 11 | [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
12 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" | 12 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" |
13 | [(selection)]="selectedUsers" | ||
13 | > | 14 | > |
15 | <ng-template pTemplate="caption"> | ||
16 | <div class="caption"> | ||
17 | <div> | ||
18 | <my-action-dropdown | ||
19 | *ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange" | ||
20 | [actions]="bulkUserActions" [entry]="selectedUsers" | ||
21 | > | ||
22 | </my-action-dropdown> | ||
23 | </div> | ||
24 | |||
25 | <div> | ||
26 | <input | ||
27 | type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." | ||
28 | (keyup)="onSearch($event.target.value)" | ||
29 | > | ||
30 | </div> | ||
31 | </div> | ||
32 | </ng-template> | ||
33 | |||
14 | <ng-template pTemplate="header"> | 34 | <ng-template pTemplate="header"> |
15 | <tr> | 35 | <tr> |
36 | <th style="width: 40px"> | ||
37 | <p-tableHeaderCheckbox></p-tableHeaderCheckbox> | ||
38 | </th> | ||
16 | <th style="width: 40px"></th> | 39 | <th style="width: 40px"></th> |
17 | <th i18n pSortableColumn="username">Username <p-sortIcon field="username"></p-sortIcon></th> | 40 | <th i18n pSortableColumn="username">Username <p-sortIcon field="username"></p-sortIcon></th> |
18 | <th i18n>Email</th> | 41 | <th i18n>Email</th> |
@@ -25,22 +48,42 @@ | |||
25 | 48 | ||
26 | <ng-template pTemplate="body" let-expanded="expanded" let-user> | 49 | <ng-template pTemplate="body" let-expanded="expanded" let-user> |
27 | 50 | ||
28 | <tr [ngClass]="{ banned: user.blocked }"> | 51 | <tr [pSelectableRow]="user" [ngClass]="{ banned: user.blocked }"> |
52 | <td> | ||
53 | <p-tableCheckbox [value]="user"></p-tableCheckbox> | ||
54 | </td> | ||
55 | |||
29 | <td> | 56 | <td> |
30 | <span *ngIf="user.blockedReason" class="expander" [pRowToggler]="user"> | 57 | <span *ngIf="user.blockedReason" class="expander" [pRowToggler]="user"> |
31 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> | 58 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> |
32 | </span> | 59 | </span> |
33 | </td> | 60 | </td> |
61 | |||
34 | <td> | 62 | <td> |
35 | {{ user.username }} | 63 | <a i18n-title title="Go to the account page" target="_blank" rel="noopener noreferrer" [routerLink]="[ '/accounts/' + user.username ]"> |
36 | <span *ngIf="user.blocked" class="banned-info">(banned)</span> | 64 | {{ user.username }} |
65 | <span i18n *ngIf="user.blocked" class="banned-info">(banned)</span> | ||
66 | </a> | ||
37 | </td> | 67 | </td> |
38 | <td>{{ user.email }}</td> | 68 | |
69 | <td *ngIf="!requiresEmailVerification || user.blocked; else emailWithVerificationStatus">{{ user.email }}</td> | ||
70 | |||
71 | <ng-template #emailWithVerificationStatus> | ||
72 | <td *ngIf="user.emailVerified === false; else emailVerifiedNotFalse" i18n-title title="User's email must be verified to login"> | ||
73 | <em>? {{ user.email }}</em> | ||
74 | </td> | ||
75 | <ng-template #emailVerifiedNotFalse> | ||
76 | <td i18n-title title="User's email is verified / User can login without email verification"> | ||
77 | ✓ {{ user.email }} | ||
78 | </td> | ||
79 | </ng-template> | ||
80 | </ng-template> | ||
81 | |||
39 | <td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td> | 82 | <td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td> |
40 | <td>{{ user.roleLabel }}</td> | 83 | <td>{{ user.roleLabel }}</td> |
41 | <td>{{ user.createdAt }}</td> | 84 | <td>{{ user.createdAt }}</td> |
42 | <td class="action-cell"> | 85 | <td class="action-cell"> |
43 | <my-user-moderation-dropdown [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> | 86 | <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> |
44 | </my-user-moderation-dropdown> | 87 | </my-user-moderation-dropdown> |
45 | </td> | 88 | </td> |
46 | </tr> | 89 | </tr> |
@@ -56,3 +99,4 @@ | |||
56 | </ng-template> | 99 | </ng-template> |
57 | </p-table> | 100 | </p-table> |
58 | 101 | ||
102 | <my-user-ban-modal #userBanModal (userBanned)="onUserChanged()"></my-user-ban-modal> | ||
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index 47291918d..5274be01c 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss | |||
@@ -2,7 +2,7 @@ | |||
2 | @import '_mixins'; | 2 | @import '_mixins'; |
3 | 3 | ||
4 | .add-button { | 4 | .add-button { |
5 | @include create-button('../../../../assets/images/global/add.svg'); | 5 | @include create-button; |
6 | } | 6 | } |
7 | 7 | ||
8 | tr.banned { | 8 | tr.banned { |
@@ -15,4 +15,12 @@ tr.banned { | |||
15 | 15 | ||
16 | .ban-reason-label { | 16 | .ban-reason-label { |
17 | font-weight: $font-semibold; | 17 | font-weight: $font-semibold; |
18 | } \ No newline at end of file | 18 | } |
19 | |||
20 | .caption { | ||
21 | justify-content: space-between; | ||
22 | |||
23 | input { | ||
24 | @include peertube-input-text(250px); | ||
25 | } | ||
26 | } | ||
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 dee3ed643..66ab796f9 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,12 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit, ViewChild } from '@angular/core' |
2 | import { NotificationsService } from 'angular2-notifications' | 2 | import { Notifier } from '@app/core' |
3 | import { SortMeta } from 'primeng/components/common/sortmeta' | 3 | import { SortMeta } from 'primeng/components/common/sortmeta' |
4 | import { ConfirmService } from '../../../core' | 4 | import { ConfirmService, ServerService } from '../../../core' |
5 | import { RestPagination, RestTable, UserService } from '../../../shared' | 5 | import { RestPagination, RestTable, UserService } from '../../../shared' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { User } from '../../../../../../shared' | 7 | import { User } from '../../../../../../shared' |
8 | import { UserBanModalComponent } from '@app/shared/moderation' | ||
9 | import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' | ||
8 | 10 | ||
9 | @Component({ | 11 | @Component({ |
10 | selector: 'my-user-list', | 12 | selector: 'my-user-list', |
@@ -12,38 +14,139 @@ import { User } from '../../../../../../shared' | |||
12 | styleUrls: [ './user-list.component.scss' ] | 14 | styleUrls: [ './user-list.component.scss' ] |
13 | }) | 15 | }) |
14 | export class UserListComponent extends RestTable implements OnInit { | 16 | export class UserListComponent extends RestTable implements OnInit { |
17 | @ViewChild('userBanModal') userBanModal: UserBanModalComponent | ||
18 | |||
15 | users: User[] = [] | 19 | users: User[] = [] |
16 | totalRecords = 0 | 20 | totalRecords = 0 |
17 | rowsPerPage = 10 | 21 | rowsPerPage = 10 |
18 | sort: SortMeta = { field: 'createdAt', order: 1 } | 22 | sort: SortMeta = { field: 'createdAt', order: 1 } |
19 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } | 23 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } |
20 | 24 | ||
25 | selectedUsers: User[] = [] | ||
26 | bulkUserActions: DropdownAction<User[]>[] = [] | ||
27 | |||
21 | constructor ( | 28 | constructor ( |
22 | private notificationsService: NotificationsService, | 29 | private notifier: Notifier, |
23 | private confirmService: ConfirmService, | 30 | private confirmService: ConfirmService, |
31 | private serverService: ServerService, | ||
24 | private userService: UserService, | 32 | private userService: UserService, |
25 | private i18n: I18n | 33 | private i18n: I18n |
26 | ) { | 34 | ) { |
27 | super() | 35 | super() |
28 | } | 36 | } |
29 | 37 | ||
38 | get requiresEmailVerification () { | ||
39 | return this.serverService.getConfig().signup.requiresEmailVerification | ||
40 | } | ||
41 | |||
30 | ngOnInit () { | 42 | ngOnInit () { |
31 | this.loadSort() | 43 | this.initialize() |
44 | |||
45 | this.bulkUserActions = [ | ||
46 | { | ||
47 | label: this.i18n('Delete'), | ||
48 | handler: users => this.removeUsers(users) | ||
49 | }, | ||
50 | { | ||
51 | label: this.i18n('Ban'), | ||
52 | handler: users => this.openBanUserModal(users), | ||
53 | isDisplayed: users => users.every(u => u.blocked === false) | ||
54 | }, | ||
55 | { | ||
56 | label: this.i18n('Unban'), | ||
57 | handler: users => this.unbanUsers(users), | ||
58 | isDisplayed: users => users.every(u => u.blocked === true) | ||
59 | }, | ||
60 | { | ||
61 | label: this.i18n('Set Email as Verified'), | ||
62 | handler: users => this.setEmailsAsVerified(users), | ||
63 | isDisplayed: users => this.requiresEmailVerification && users.every(u => !u.blocked && u.emailVerified === false) | ||
64 | } | ||
65 | ] | ||
66 | } | ||
67 | |||
68 | openBanUserModal (users: User[]) { | ||
69 | for (const user of users) { | ||
70 | if (user.username === 'root') { | ||
71 | this.notifier.error(this.i18n('You cannot ban root.')) | ||
72 | return | ||
73 | } | ||
74 | } | ||
75 | |||
76 | this.userBanModal.openModal(users) | ||
32 | } | 77 | } |
33 | 78 | ||
34 | onUserChanged () { | 79 | onUserChanged () { |
35 | this.loadData() | 80 | this.loadData() |
36 | } | 81 | } |
37 | 82 | ||
83 | async unbanUsers (users: User[]) { | ||
84 | const message = this.i18n('Do you really want to unban {{num}} users?', { num: users.length }) | ||
85 | |||
86 | const res = await this.confirmService.confirm(message, this.i18n('Unban')) | ||
87 | if (res === false) return | ||
88 | |||
89 | this.userService.unbanUsers(users) | ||
90 | .subscribe( | ||
91 | () => { | ||
92 | const message = this.i18n('{{num}} users unbanned.', { num: users.length }) | ||
93 | |||
94 | this.notifier.success(message) | ||
95 | this.loadData() | ||
96 | }, | ||
97 | |||
98 | err => this.notifier.error(err.message) | ||
99 | ) | ||
100 | } | ||
101 | |||
102 | async removeUsers (users: User[]) { | ||
103 | for (const user of users) { | ||
104 | if (user.username === 'root') { | ||
105 | this.notifier.error(this.i18n('You cannot delete root.')) | ||
106 | return | ||
107 | } | ||
108 | } | ||
109 | |||
110 | const message = this.i18n('If you remove these users, you will not be able to create others with the same username!') | ||
111 | const res = await this.confirmService.confirm(message, this.i18n('Delete')) | ||
112 | if (res === false) return | ||
113 | |||
114 | this.userService.removeUser(users).subscribe( | ||
115 | () => { | ||
116 | this.notifier.success(this.i18n('{{num}} users deleted.', { num: users.length })) | ||
117 | this.loadData() | ||
118 | }, | ||
119 | |||
120 | err => this.notifier.error(err.message) | ||
121 | ) | ||
122 | } | ||
123 | |||
124 | async setEmailsAsVerified (users: User[]) { | ||
125 | this.userService.updateUsers(users, { emailVerified: true }).subscribe( | ||
126 | () => { | ||
127 | this.notifier.success(this.i18n('{{num}} users email set as verified.', { num: users.length })) | ||
128 | this.loadData() | ||
129 | }, | ||
130 | |||
131 | err => this.notifier.error(err.message) | ||
132 | ) | ||
133 | } | ||
134 | |||
135 | isInSelectionMode () { | ||
136 | return this.selectedUsers.length !== 0 | ||
137 | } | ||
138 | |||
38 | protected loadData () { | 139 | protected loadData () { |
39 | this.userService.getUsers(this.pagination, this.sort) | 140 | this.selectedUsers = [] |
40 | .subscribe( | 141 | |
41 | resultList => { | 142 | this.userService.getUsers(this.pagination, this.sort, this.search) |
42 | this.users = resultList.data | 143 | .subscribe( |
43 | this.totalRecords = resultList.total | 144 | resultList => { |
44 | }, | 145 | this.users = resultList.data |
45 | 146 | this.totalRecords = resultList.total | |
46 | err => this.notificationsService.error(this.i18n('Error'), err.message) | 147 | }, |
47 | ) | 148 | |
149 | err => this.notifier.error(err.message) | ||
150 | ) | ||
48 | } | 151 | } |
49 | } | 152 | } |