Improve admin tables

2 files changed, 31 insertions, 15 deletions

diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index fc1cf0dc4..24981d3e9 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -1,14 +1,26 @@
-<p-dataTable
-    [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
-    sortField="createdAt" (onLazyLoad)="loadLazy($event)"
+<p-table
+  [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
 >
-  <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column>
-  <p-column field="following.host" header="Host"></p-column>
-  <p-column field="state" header="State"></p-column>
-  <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
-  <p-column styleClass="action-cell">
-    <ng-template pTemplate="body" let-following="rowData">
-      <my-delete-button (click)="removeFollowing(following)"></my-delete-button>
-    </ng-template>
-  </p-column>
-</p-dataTable>
+  <ng-template pTemplate="header">
+    <tr>
+      <th style="width: 60px">ID</th>
+      <th>Host</th>
+      <th>State</th>
+      <th pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
+      <th></th>
+    </tr>
+  </ng-template>
+
+  <ng-template pTemplate="body" let-follow>
+    <tr>
+      <td>{{ follow.id }}</td>
+      <td>{{ follow.following.host }}</td>
+      <td>{{ follow.state }}</td>
+      <td>{{ follow.createdAt }}</td>
+      <td class="action-cell">
+        <my-delete-button (click)="removeFollowing(follow)"></my-delete-button>
+      </td>
+    </tr>
+  </ng-template>
+</p-table>
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
index ad1bd4536..873a5d965 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
 import { SortMeta } from 'primeng/primeng'
 import { AccountFollow } from '../../../../../../shared/models/actors/follow.model'
@@ -10,7 +10,7 @@ import { FollowService } from '../shared'
   selector: 'my-followers-list',
   templateUrl: './following-list.component.html'
 })
-export class FollowingListComponent extends RestTable {
+export class FollowingListComponent extends RestTable implements OnInit {
   following: AccountFollow[] = []
   totalRecords = 0
   rowsPerPage = 10
@@ -25,6 +25,10 @@ export class FollowingListComponent extends RestTable {
     super()
   }
 
+  ngOnInit () {
+    this.loadSort()
+  }
+
   async removeFollowing (follow: AccountFollow) {
     const res = await this.confirmService.confirm(`Do you really want to unfollow ${follow.following.host}?`, 'Unfollow')
     if (res === false) return