Add quota used in users list

3 files changed, 8 insertions, 6 deletions

diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index ad7fb1eee..a0e2f666d 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -4,9 +4,9 @@ import { Injectable } from '@angular/core'
 import { BytesPipe } from 'ngx-pipes'
 import { SortMeta } from 'primeng/components/common/sortmeta'
 import { Observable } from 'rxjs'
-import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared'
+import { ResultList, UserCreate, UserUpdate, User } from '../../../../../../shared'
 import { environment } from '../../../../environments/environment'
-import { RestExtractor, RestPagination, RestService, User } from '../../../shared'
+import { RestExtractor, RestPagination, RestService } from '../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Injectable()
@@ -79,8 +79,11 @@ export class UserService {
       videoQuota = this.bytesPipe.transform(user.videoQuota, 0)
     }
 
+    const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0)
+
     return Object.assign(user, {
-      videoQuota
+      videoQuota,
+      videoQuotaUsed
     })
   }
 }
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 a92fe95ef..bb1b26442 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
@@ -36,7 +36,7 @@
         <span *ngIf="user.blocked" class="banned-info">(banned)</span>
       </td>
       <td>{{ user.email }}</td>
-      <td>{{ user.videoQuota }}</td>
+      <td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td>
       <td>{{ user.roleLabel }}</td>
       <td>{{ user.createdAt }}</td>
       <td class="action-cell">
diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts
index f63bfb2b1..fc34dbf2d 100644
--- a/client/src/app/shared/video-import/video-import.service.ts
+++ b/client/src/app/shared/video-import/video-import.service.ts
@@ -5,9 +5,8 @@ import { Observable } from 'rxjs'
 import { VideoImport } from '../../../../../shared'
 import { environment } from '../../../environments/environment'
 import { RestExtractor, RestService } from '../rest'
-import { VideoImportCreate } from '../../../../../shared/models/videos'
+import { VideoImportCreate, VideoUpdate } from '../../../../../shared/models/videos'
 import { objectToFormData } from '@app/shared/misc/utils'
-import { VideoUpdate } from '../../../../../shared/models/videos'
 import { ResultList } from '../../../../../shared/models/result-list.model'
 import { UserService } from '@app/shared/users/user.service'
 import { SortMeta } from 'primeng/components/common/sortmeta'