1 files changed, 29 insertions, 59 deletions

diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.ts b/client/src/app/+admin/friends/friend-list/friend-list.component.ts
index 822a112cc..6a8bd492c 100644
--- a/client/src/app/+admin/friends/friend-list/friend-list.component.ts
+++ b/client/src/app/+admin/friends/friend-list/friend-list.component.ts
@@ -1,71 +1,31 @@
-import { Component } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 
 import { NotificationsService } from 'angular2-notifications'
-import { ServerDataSource } from 'ng2-smart-table'
 
 import { ConfirmService } from '../../../core'
-import { Utils } from '../../../shared'
 import { FriendService } from '../shared'
 import { Pod } from '../../../../../../shared'
 
 @Component({
   selector: 'my-friend-list',
   templateUrl: './friend-list.component.html',
-  styleUrls: [ './friend-list.component.scss' ]
+  styleUrls: ['./friend-list.component.scss']
 })
-export class FriendListComponent {
-  friendsSource = null
-  tableSettings = {
-    mode: 'external',
-    attr: {
-      class: 'table-hover'
-    },
-    hideSubHeader: true,
-    actions: {
-      position: 'right',
-      add: false,
-      edit: false,
-      delete: true
-    },
-    delete: {
-      deleteButtonContent: Utils.getRowDeleteButton()
-    },
-    columns: {
-      id: {
-        title: 'ID',
-        sort: false,
-        sortDirection: 'asc'
-      },
-      host: {
-        title: 'Host',
-        sort: false
-      },
-      email: {
-        title: 'Email',
-        sort: false
-      },
-      score: {
-        title: 'Score',
-        sort: false
-      },
-      createdAt: {
-        title: 'Created Date',
-        sort: false,
-        valuePrepareFunction: Utils.dateToHuman
-      }
-    }
-  }
+export class FriendListComponent implements OnInit {
+  friends: Pod[] = []
 
   constructor (
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
     private friendService: FriendService
-  ) {
-    this.friendsSource = this.friendService.getDataSource()
+  ) {}
+
+  ngOnInit () {
+    this.loadData()
   }
 
   hasFriends () {
-    return this.friendsSource.count() !== 0
+    return this.friends.length !== 0
   }
 
   quitFriends () {
@@ -77,32 +37,42 @@ export class FriendListComponent {
         this.friendService.quitFriends().subscribe(
           status => {
             this.notificationsService.success('Success', 'Friends left!')
-            this.friendsSource.refresh()
+            this.loadData()
           },
 
-          err => this.notificationsService.error('Error', err.text)
+          err => this.notificationsService.error('Error', err)
         )
       }
     )
   }
 
-  removeFriend ({ data }) {
+  removeFriend (friend: Pod) {
     const confirmMessage = 'Do you really want to remove this friend ? All its videos will be deleted.'
-    const friend: Pod = data
 
     this.confirmService.confirm(confirmMessage, 'Remove').subscribe(
       res => {
         if (res === false) return
 
         this.friendService.removeFriend(friend).subscribe(
-          status => {
-            this.notificationsService.success('Success', 'Friend removed')
-            this.friendsSource.refresh()
-          },
+          status => {
+            this.notificationsService.success('Success', 'Friend removed')
+            this.loadData()
+          },
 
-          err => this.notificationsService.error('Error', err.text)
-        )
+          err => this.notificationsService.error('Error', err)
+        )
       }
     )
   }
+
+  private loadData () {
+    this.friendService.getFriends()
+                      .subscribe(
+                        resultList => {
+                          this.friends = resultList.data
+                        },
+
+                        err => this.notificationsService.error('Error', err)
+                      )
+  }
 }