Improve admin tables

2 files changed, 35 insertions, 19 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 08f4caeb9..8dbe9ddc4 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
@@ -7,20 +7,32 @@
   </a>
 </div>
 
-<p-dataTable
-    [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
-    sortField="id" (onLazyLoad)="loadLazy($event)"
+<p-table
+  [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
 >
-  <p-column field="id" header="ID" [sortable]="true" [style]="{ width: '60px' }"></p-column>
-  <p-column field="username" header="Username" [sortable]="true"></p-column>
-  <p-column field="email" header="Email"></p-column>
-  <p-column field="videoQuota" header="Video quota"></p-column>
-  <p-column field="roleLabel" header="Role"></p-column>
-  <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
-  <p-column styleClass="action-cell">
-    <ng-template pTemplate="body" let-user="rowData">
-      <my-edit-button [routerLink]="getRouterUserEditLink(user)"></my-edit-button>
-      <my-delete-button (click)="removeUser(user)"></my-delete-button>
-    </ng-template>
-  </p-column>
-</p-dataTable>
+  <ng-template pTemplate="header">
+    <tr>
+      <th pSortableColumn="username">Username <p-sortIcon field="username"></p-sortIcon></th>
+      <th>Email</th>
+      <th>Video quota</th>
+      <th>Role</th>
+      <th pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
+      <th></th>
+    </tr>
+  </ng-template>
+
+  <ng-template pTemplate="body" let-user>
+    <tr>
+      <td>{{ user.username }}</td>
+      <td>{{ user.email }}</td>
+      <td>{{ user.videoQuota }}</td>
+      <td>{{ user.roleLabel }}</td>
+      <td>{{ user.createdAt }}</td>
+      <td class="action-cell">
+        <my-edit-button [routerLink]="getRouterUserEditLink(user)"></my-edit-button>
+        <my-delete-button (click)="removeUser(user)"></my-delete-button>
+      </td>
+    </tr>
+  </ng-template>
+</p-table>
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 512152808..a52df49c0 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,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 
 import { NotificationsService } from 'angular2-notifications'
 import { SortMeta } from 'primeng/components/common/sortmeta'
@@ -12,11 +12,11 @@ import { UserService } from '../shared'
   templateUrl: './user-list.component.html',
   styleUrls: [ './user-list.component.scss' ]
 })
-export class UserListComponent extends RestTable {
+export class UserListComponent extends RestTable implements OnInit {
   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 }
 
   constructor (
@@ -27,6 +27,10 @@ export class UserListComponent extends RestTable {
     super()
   }
 
+  ngOnInit () {
+    this.loadSort()
+  }
+
   async removeUser (user: User) {
     if (user.username === 'root') {
       this.notificationsService.error('Error', 'You cannot delete root.')