From 00004f7f6b966a975498612117212b5373f4103c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 27 Oct 2021 09:36:37 +0200
Subject: [PATCH] Put admin users in overview tab

---
 client/src/app/+admin/admin-routing.module.ts     |  5 +++--
 client/src/app/+admin/admin.component.ts          | 15 ++++++++++++++-
 client/src/app/+admin/admin.module.ts             |  3 +--
 client/src/app/+admin/overview/index.ts           |  2 ++
 client/src/app/+admin/overview/overview.routes.ts |  6 ++++++
 .../src/app/+admin/{ => overview}/users/index.ts  |  1 -
 .../{ => overview}/users/user-edit/index.ts       |  0
 .../users/user-edit/user-create.component.ts      |  0
 .../users/user-edit/user-edit.component.html      |  0
 .../users/user-edit/user-edit.component.scss      |  0
 .../{ => overview}/users/user-edit/user-edit.ts   |  2 +-
 .../users/user-edit/user-password.component.html  |  0
 .../users/user-edit/user-password.component.scss  |  0
 .../users/user-edit/user-password.component.ts    |  0
 .../users/user-edit/user-update.component.ts      |  0
 .../{ => overview}/users/user-list/index.ts       |  0
 .../users/user-list/user-list.component.html      |  5 +++++
 .../users/user-list/user-list.component.scss      |  0
 .../users/user-list/user-list.component.ts        |  0
 .../+admin/{ => overview}/users/users.routes.ts   |  2 --
 client/src/app/+admin/users/users.component.ts    |  7 -------
 21 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 client/src/app/+admin/overview/index.ts
 create mode 100644 client/src/app/+admin/overview/overview.routes.ts
 rename client/src/app/+admin/{ => overview}/users/index.ts (71%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/index.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-create.component.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-edit.component.html (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-edit.component.scss (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-edit.ts (97%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-password.component.html (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-password.component.scss (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-password.component.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/user-edit/user-update.component.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/user-list/index.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/user-list/user-list.component.html (98%)
 rename client/src/app/+admin/{ => overview}/users/user-list/user-list.component.scss (100%)
 rename client/src/app/+admin/{ => overview}/users/user-list/user-list.component.ts (100%)
 rename client/src/app/+admin/{ => overview}/users/users.routes.ts (92%)
 delete mode 100644 client/src/app/+admin/users/users.component.ts

diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index d029661d3..bd08b8287 100644
--- a/client/src/app/+admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -6,7 +6,7 @@ import { PluginsRoutes } from '@app/+admin/plugins/plugins.routes'
 import { SystemRoutes } from '@app/+admin/system'
 import { AdminComponent } from './admin.component'
 import { FollowsRoutes } from './follows'
-import { UsersRoutes } from './users'
+import { OverviewRoutes } from './overview'
 
 const adminRoutes: Routes = [
   {
@@ -18,8 +18,9 @@ const adminRoutes: Routes = [
         redirectTo: 'users',
         pathMatch: 'full'
       },
+
       ...FollowsRoutes,
-      ...UsersRoutes,
+      ...OverviewRoutes,
       ...ModerationRoutes,
       ...SystemRoutes,
       ...ConfigRoutes,
diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 15739f8d3..27d5e0a10 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -31,8 +31,21 @@ export class AdminComponent implements OnInit {
   }
 
   private buildOverviewItems () {
+    const overviewItems: TopMenuDropdownParam = {
+      label: $localize`Overview`,
+      children: []
+    }
+
     if (this.hasUsersRight()) {
-      this.menuEntries.push({ label: $localize`Users`, routerLink: '/admin/users' })
+      overviewItems.children.push({
+        label: $localize`Users`,
+        routerLink: '/admin/users',
+        iconName: 'user'
+      })
+    }
+
+    if (overviewItems.children.length !== 0) {
+      this.menuEntries.push(overviewItems)
     }
   }
 
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index 1ea7b9784..a2bd88880 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -33,6 +33,7 @@ import { AbuseListComponent, VideoBlockListComponent } from './moderation'
 import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist'
 import { ModerationComponent } from './moderation/moderation.component'
 import { VideoCommentListComponent } from './moderation/video-comment-list'
+import { UserCreateComponent, UserListComponent, UserPasswordComponent, UserUpdateComponent } from './overview'
 import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component'
 import { PluginSearchComponent } from './plugins/plugin-search/plugin-search.component'
 import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component'
@@ -41,7 +42,6 @@ import { PluginApiService } from './plugins/shared/plugin-api.service'
 import { JobService, LogsComponent, LogsService, SystemComponent } from './system'
 import { DebugComponent, DebugService } from './system/debug'
 import { JobsComponent } from './system/jobs/jobs.component'
-import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersComponent, UserUpdateComponent } from './users'
 
 @NgModule({
   imports: [
@@ -73,7 +73,6 @@ import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersCom
     VideoRedundanciesListComponent,
     VideoRedundancyInformationComponent,
 
-    UsersComponent,
     UserCreateComponent,
     UserUpdateComponent,
     UserPasswordComponent,
diff --git a/client/src/app/+admin/overview/index.ts b/client/src/app/+admin/overview/index.ts
new file mode 100644
index 000000000..b71a6a45f
--- /dev/null
+++ b/client/src/app/+admin/overview/index.ts
@@ -0,0 +1,2 @@
+export * from './users'
+export * from './overview.routes'
diff --git a/client/src/app/+admin/overview/overview.routes.ts b/client/src/app/+admin/overview/overview.routes.ts
new file mode 100644
index 000000000..cb5986072
--- /dev/null
+++ b/client/src/app/+admin/overview/overview.routes.ts
@@ -0,0 +1,6 @@
+import { Routes } from '@angular/router'
+import { UsersRoutes } from './users'
+
+export const OverviewRoutes: Routes = [
+  ...UsersRoutes
+]
diff --git a/client/src/app/+admin/users/index.ts b/client/src/app/+admin/overview/users/index.ts
similarity index 71%
rename from client/src/app/+admin/users/index.ts
rename to client/src/app/+admin/overview/users/index.ts
index 156e54d89..6f15ab578 100644
--- a/client/src/app/+admin/users/index.ts
+++ b/client/src/app/+admin/overview/users/index.ts
@@ -1,4 +1,3 @@
 export * from './user-edit'
 export * from './user-list'
-export * from './users.component'
 export * from './users.routes'
diff --git a/client/src/app/+admin/users/user-edit/index.ts b/client/src/app/+admin/overview/users/user-edit/index.ts
similarity index 100%
rename from client/src/app/+admin/users/user-edit/index.ts
rename to client/src/app/+admin/overview/users/user-edit/index.ts
diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/overview/users/user-edit/user-create.component.ts
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-create.component.ts
rename to client/src/app/+admin/overview/users/user-edit/user-create.component.ts
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-edit.component.html
rename to client/src/app/+admin/overview/users/user-edit/user-edit.component.html
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.scss b/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-edit.component.scss
rename to client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/overview/users/user-edit/user-edit.ts
similarity index 97%
rename from client/src/app/+admin/users/user-edit/user-edit.ts
rename to client/src/app/+admin/overview/users/user-edit/user-edit.ts
index af5e674a7..069b62a53 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.ts
@@ -4,7 +4,7 @@ import { AuthService, ScreenService, ServerService, User } from '@app/core'
 import { FormReactive } from '@app/shared/shared-forms'
 import { USER_ROLE_LABELS } from '@shared/core-utils/users'
 import { HTMLServerConfig, UserAdminFlag, UserRole, VideoResolution } from '@shared/models'
-import { SelectOptionsItem } from '../../../../types/select-options-item.model'
+import { SelectOptionsItem } from '../../../../../types/select-options-item.model'
 
 @Directive()
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.html b/client/src/app/+admin/overview/users/user-edit/user-password.component.html
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-password.component.html
rename to client/src/app/+admin/overview/users/user-edit/user-password.component.html
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.scss b/client/src/app/+admin/overview/users/user-edit/user-password.component.scss
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-password.component.scss
rename to client/src/app/+admin/overview/users/user-edit/user-password.component.scss
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.ts b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-password.component.ts
rename to client/src/app/+admin/overview/users/user-edit/user-password.component.ts
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/overview/users/user-edit/user-update.component.ts
similarity index 100%
rename from client/src/app/+admin/users/user-edit/user-update.component.ts
rename to client/src/app/+admin/overview/users/user-edit/user-update.component.ts
diff --git a/client/src/app/+admin/users/user-list/index.ts b/client/src/app/+admin/overview/users/user-list/index.ts
similarity index 100%
rename from client/src/app/+admin/users/user-list/index.ts
rename to client/src/app/+admin/overview/users/user-list/index.ts
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html
similarity index 98%
rename from client/src/app/+admin/users/user-list/user-list.component.html
rename to client/src/app/+admin/overview/users/user-list/user-list.component.html
index c82f3c06f..a96dbd7f8 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html
@@ -1,3 +1,8 @@
+<h1>
+  <my-global-icon iconName="user" aria-hidden="true"></my-global-icon>
+  <ng-container i18n>Users</ng-container>
+</h1>
+
 <p-table
   [value]="users" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
   [sortField]="sort.field" [sortOrder]="sort.order"  dataKey="id" [resizableColumns]="true" [(selection)]="selectedUsers"
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
similarity index 100%
rename from client/src/app/+admin/users/user-list/user-list.component.scss
rename to client/src/app/+admin/overview/users/user-list/user-list.component.scss
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
similarity index 100%
rename from client/src/app/+admin/users/user-list/user-list.component.ts
rename to client/src/app/+admin/overview/users/user-list/user-list.component.ts
diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/overview/users/users.routes.ts
similarity index 92%
rename from client/src/app/+admin/users/users.routes.ts
rename to client/src/app/+admin/overview/users/users.routes.ts
index 9175be067..8b63f5bc7 100644
--- a/client/src/app/+admin/users/users.routes.ts
+++ b/client/src/app/+admin/overview/users/users.routes.ts
@@ -3,12 +3,10 @@ import { UserRightGuard } from '@app/core'
 import { UserRight } from '@shared/models'
 import { UserCreateComponent, UserUpdateComponent } from './user-edit'
 import { UserListComponent } from './user-list'
-import { UsersComponent } from './users.component'
 
 export const UsersRoutes: Routes = [
   {
     path: 'users',
-    component: UsersComponent,
     canActivate: [ UserRightGuard ],
     data: {
       userRight: UserRight.MANAGE_USERS
diff --git a/client/src/app/+admin/users/users.component.ts b/client/src/app/+admin/users/users.component.ts
deleted file mode 100644
index e9c8f6b0d..000000000
--- a/client/src/app/+admin/users/users.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-  template: '<router-outlet></router-outlet>'
-})
-export class UsersComponent {
-}
-- 
2.41.0