X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fusers%2Fuser-list%2Fuser-list.component.ts;h=f5f8f3e4a8c200bfa9ab3c46bb4629d28aed206c;hb=141b177db088891e84040f68aa95008fb52f1d44;hp=c3fa55825bca613e789943c3f5e53c8fd4917d32;hpb=d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb;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 c3fa55825..f5f8f3e4a 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,11 +1,13 @@
-import { Component, OnInit } from '@angular/core'
-import { SortMeta } from 'primeng/primeng'
-
+import { Component, OnInit, ViewChild } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
-
+import { SortMeta } from 'primeng/components/common/sortmeta'
 import { ConfirmService } from '../../../core'
-import { RestTable, RestPagination, User } from '../../../shared'
+import { RestPagination, RestTable, User } from '../../../shared'
 import { UserService } from '../shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { DropdownAction } from '@app/shared/buttons/action-dropdown.component'
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
+import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-modal.component'
 
 @Component({
   selector: 'my-user-list',
@@ -13,48 +15,113 @@ import { UserService } from '../shared'
   styleUrls: [ './user-list.component.scss' ]
 })
 export class UserListComponent extends RestTable implements OnInit {
+  @ViewChild('userBanModal') userBanModal: UserBanModalComponent
+
   users: User[] = []
   totalRecords = 0
   rowsPerPage = 10
-  sort: SortMeta = { field: 'id', order: 1 }
+  sort: SortMeta = { field: 'createdAt', order: 1 }
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+  userActions: DropdownAction<User>[] = []
+
+  private userToBan: User
+  private openedModal: NgbModalRef
 
   constructor (
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
-    private userService: UserService
+    private userService: UserService,
+    private i18n: I18n
   ) {
     super()
+
+    this.userActions = [
+      {
+        label: this.i18n('Edit'),
+        linkBuilder: this.getRouterUserEditLink
+      },
+      {
+        label: this.i18n('Delete'),
+        handler: user => this.removeUser(user)
+      },
+      {
+        label: this.i18n('Ban'),
+        handler: user => this.openBanUserModal(user),
+        isDisplayed: user => !user.blocked
+      },
+      {
+        label: this.i18n('Unban'),
+        handler: user => this.unbanUser(user),
+        isDisplayed: user => user.blocked
+      }
+    ]
   }
 
   ngOnInit () {
-    this.loadData()
+    this.loadSort()
+  }
+
+  hideBanUserModal () {
+    this.userToBan = undefined
+    this.openedModal.close()
   }
 
-  removeUser (user: User) {
+  openBanUserModal (user: User) {
     if (user.username === 'root') {
-      this.notificationsService.error('Error', 'You cannot delete root.')
+      this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot ban root.'))
       return
     }
 
-    this.confirmService.confirm('Do you really want to delete this user?', 'Delete').subscribe(
-      res => {
-        if (res === false) return
+    this.userBanModal.openModal(user)
+  }
 
-        this.userService.removeUser(user).subscribe(
-          () => {
-            this.notificationsService.success('Success', `User ${user.username} deleted.`)
-            this.loadData()
-          },
+  onUserBanned () {
+    this.loadData()
+  }
 
-          err => this.notificationsService.error('Error', err)
+  async unbanUser (user: User) {
+    const message = this.i18n('Do you really want to unban {{username}}?', { username: user.username })
+    const res = await this.confirmService.confirm(message, this.i18n('Unban'))
+    if (res === false) return
+
+    this.userService.unbanUser(user)
+      .subscribe(
+        () => {
+          this.notificationsService.success(
+            this.i18n('Success'),
+            this.i18n('User {{username}} unbanned.', { username: user.username })
+          )
+          this.loadData()
+        },
+
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
+      )
+  }
+
+  async removeUser (user: User) {
+    if (user.username === 'root') {
+      this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot delete root.'))
+      return
+    }
+
+    const res = await this.confirmService.confirm(this.i18n('Do you really want to delete this user?'), this.i18n('Delete'))
+    if (res === false) return
+
+    this.userService.removeUser(user).subscribe(
+      () => {
+        this.notificationsService.success(
+          this.i18n('Success'),
+          this.i18n('User {{username}} deleted.', { username: user.username })
         )
-      }
+        this.loadData()
+      },
+
+      err => this.notificationsService.error(this.i18n('Error'), err.message)
     )
   }
 
   getRouterUserEditLink (user: User) {
-    return [ '/admin', 'users', user.id, 'update' ]
+    return [ '/admin', 'users', 'update', user.id ]
   }
 
   protected loadData () {
@@ -65,7 +132,7 @@ export class UserListComponent extends RestTable implements OnInit {
                         this.totalRecords = resultList.total
                       },
 
-                      err => this.notificationsService.error('Error', err)
+                      err => this.notificationsService.error(this.i18n('Error'), err.message)
                     )
   }
 }