rename blacklist to block/blocklist, merge block and auto-block views

- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list

resolves #2790

1 files changed, 23 insertions, 25 deletions

diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts
index a024f2bee..aeb555c4a 100644
--- a/client/src/app/+admin/moderation/moderation.routes.ts
+++ b/client/src/app/+admin/moderation/moderation.routes.ts
@@ -2,8 +2,7 @@ import { Routes } from '@angular/router'
 import { UserRight } from '../../../../../shared'
 import { UserRightGuard } from '@app/core'
 import { VideoAbuseListComponent } from '@app/+admin/moderation/video-abuse-list'
-import { VideoBlacklistListComponent } from '@app/+admin/moderation/video-blacklist-list'
-import { VideoAutoBlacklistListComponent } from '@app/+admin/moderation/video-auto-blacklist-list'
+import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list'
 import { ModerationComponent } from '@app/+admin/moderation/moderation.component'
 import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist'
 
@@ -23,45 +22,44 @@ export const ModerationRoutes: Routes = [
         pathMatch: 'full'
       },
       {
-        path: 'video-blacklist',
-        redirectTo: 'video-blacklist/list',
-        pathMatch: 'full'
-      },
-      {
-        path: 'video-auto-blacklist',
-        redirectTo: 'video-auto-blacklist/list',
-        pathMatch: 'full'
-      },
-      {
         path: 'video-abuses/list',
         component: VideoAbuseListComponent,
         canActivate: [ UserRightGuard ],
         data: {
           userRight: UserRight.MANAGE_VIDEO_ABUSES,
           meta: {
-            title: 'Video abuses list'
+            title: 'Video reports'
           }
         }
       },
       {
+        path: 'video-blacklist',
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
+      },
+      {
+        path: 'video-auto-blacklist',
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
+      },
+      {
         path: 'video-auto-blacklist/list',
-        component: VideoAutoBlacklistListComponent,
-        canActivate: [ UserRightGuard ],
-        data: {
-          userRight: UserRight.MANAGE_VIDEO_BLACKLIST,
-          meta: {
-            title: 'Auto-blacklisted videos'
-          }
-        }
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
+      },
+      {
+        path: 'video-blacklist',
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
       },
       {
-        path: 'video-blacklist/list',
-        component: VideoBlacklistListComponent,
+        path: 'video-blocks/list',
+        component: VideoBlockListComponent,
         canActivate: [ UserRightGuard ],
         data: {
-          userRight: UserRight.MANAGE_VIDEO_BLACKLIST,
+          userRight: UserRight.MANAGE_VIDEO_BLOCKS,
           meta: {
-            title: 'Blacklisted videos'
+            title: 'Videos blocked'
           }
         }
       },