From 489290b8b16bede6ddfb773adad55dee6471ccfd Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 21 Mar 2019 16:49:46 +0100
Subject: Restore videos list components

---
 .../video-auto-blacklist-list.component.html       | 75 ++++++++++------------
 .../video-auto-blacklist-list.component.ts         | 13 ++--
 2 files changed, 38 insertions(+), 50 deletions(-)

(limited to 'client/src/app/+admin/moderation')

diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html
index fe579ffd7..961ac51d3 100644
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html
+++ b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html
@@ -1,49 +1,42 @@
 <div i18n *ngIf="pagination.totalItems === 0">No results.</div>
-<div
-  myInfiniteScroller
-  [pageHeight]="pageHeight"
-  (nearOfTop)="onNearOfTop()"
-  (nearOfBottom)="onNearOfBottom()"
-  (pageChanged)="onPageChanged($event)"
-  class="videos" #videosElement
->
-  <div *ngFor="let videos of videoPages; let i = index" class="videos-page">
-    <div class="video" *ngFor="let video of videos; let j = index">
-      <div class="checkbox-container">
-        <my-peertube-checkbox [inputName]="'video-check-' + video.id" [(ngModel)]="checkedVideos[video.id]"></my-peertube-checkbox>
-      </div>
-      <my-video-thumbnail [video]="video"></my-video-thumbnail>
 
-      <div class="video-info">
-        <a class="video-info-name" [routerLink]="['/videos/watch', video.uuid]" [attr.title]="video.name">{{ video.name }}</a>
-        <div>{{ video.account.displayName }}</div>
-        <div>{{ video.publishedAt | myFromNow }}</div>
-        <div><span i18n>Privacy: </span><span>{{ video.privacy.label }}</span></div>
-        <div><span i18n>Sensitve: </span><span> {{ video.nsfw }}</span></div>
-      </div>
+<div myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" class="videos">
+  <div class="video" *ngFor="let video of videos; let i = index">
+    <div class="checkbox-container">
+      <my-peertube-checkbox [inputName]="'video-check-' + video.id" [(ngModel)]="checkedVideos[video.id]"></my-peertube-checkbox>
+    </div>
 
-      <!-- Display only once -->
-      <div class="action-selection-mode" *ngIf="isInSelectionMode() === true && i === 0 && j === 0">
-        <div class="action-selection-mode-child">
-          <span i18n class="action-button action-button-cancel-selection" (click)="abortSelectionMode()">
-            Cancel
-          </span>
+    <my-video-thumbnail [video]="video"></my-video-thumbnail>
 
-          <span class="action-button action-button-unblacklist-selection" (click)="removeSelectedVideosFromBlacklist()">
-            <my-global-icon iconName="tick"></my-global-icon>
-            <ng-container i18n>Unblacklist</ng-container>
-          </span>
-        </div>
-      </div>
+    <div class="video-info">
+      <a class="video-info-name" [routerLink]="['/videos/watch', video.uuid]" [attr.title]="video.name">{{ video.name }}</a>
+      <div>{{ video.account.displayName }}</div>
+      <div>{{ video.publishedAt | myFromNow }}</div>
+      <div><span i18n>Privacy: </span><span>{{ video.privacy.label }}</span></div>
+      <div><span i18n>Sensitive: </span><span> {{ video.nsfw }}</span></div>
+    </div>
+
+    <!-- Display only once -->
+    <div class="action-selection-mode" *ngIf="isInSelectionMode() === true && i === 0 && j === 0">
+      <div class="action-selection-mode-child">
+        <span i18n class="action-button action-button-cancel-selection" (click)="abortSelectionMode()">
+          Cancel
+        </span>
 
-      <div class="video-buttons" *ngIf="isInSelectionMode() === false">
-        <my-button
-          i18n-label
-          label="Unblacklist"
-          icon="tick"
-          (click)="removeVideoFromBlacklist(video)"
-        ></my-button>
+        <span class="action-button action-button-unblacklist-selection" (click)="removeSelectedVideosFromBlacklist()">
+          <my-global-icon iconName="tick"></my-global-icon>
+          <ng-container i18n>Unblacklist</ng-container>
+        </span>
       </div>
     </div>
 
-</div>
\ No newline at end of file
+    <div class="video-buttons" *ngIf="isInSelectionMode() === false">
+      <my-button
+        i18n-label
+        label="Unblacklist"
+        icon="tick"
+        (click)="removeVideoFromBlacklist(video)"
+      ></my-button>
+    </div>
+  </div>
+</div>
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts
index b79f574c9..af68d7e2e 100644
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts
+++ b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts
@@ -4,7 +4,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 import { Router, ActivatedRoute } from '@angular/router'
 import { AbstractVideoList } from '@app/shared/video/abstract-video-list'
 import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
-import { Notifier, AuthService } from '@app/core'
+import { Notifier, AuthService, ServerService } from '@app/core'
 import { Video } from '@shared/models'
 import { VideoBlacklistService } from '@app/shared'
 import { immutableAssign } from '@app/shared/misc/utils'
@@ -17,7 +17,6 @@ import { ScreenService } from '@app/shared/misc/screen.service'
 })
 export class VideoAutoBlacklistListComponent extends AbstractVideoList implements OnInit, OnDestroy {
   titlePage: string
-  currentRoute = '/admin/moderation/video-auto-blacklist/list'
   checkedVideos: { [ id: number ]: boolean } = {}
   pagination: ComponentPagination = {
     currentPage: 1,
@@ -25,18 +24,15 @@ export class VideoAutoBlacklistListComponent extends AbstractVideoList implement
     totalItems: null
   }
 
-  protected baseVideoWidth = -1
-  protected baseVideoHeight = 155
-
   constructor (
     protected router: Router,
     protected route: ActivatedRoute,
-    protected i18n: I18n,
     protected notifier: Notifier,
-    protected location: Location,
     protected authService: AuthService,
     protected screenService: ScreenService,
-    private videoBlacklistService: VideoBlacklistService,
+    protected serverService: ServerService,
+    private i18n: I18n,
+    private videoBlacklistService: VideoBlacklistService
   ) {
     super()
 
@@ -96,5 +92,4 @@ export class VideoAutoBlacklistListComponent extends AbstractVideoList implement
       error => this.notifier.error(error.message)
     )
   }
-
 }
-- 
cgit v1.2.3