From 71735ab41497a81973722494cbafb28a8776f9fa Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 22 Oct 2024 17:30:26 +0300
Subject: [PATCH] UI: Add mobile center in tenant level

---
 ui-ngx/src/app/core/services/menu.models.ts      | 16 +++++++++++++++-
 .../pages/admin/oauth2/oauth2-routing.module.ts  | 13 ++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts
index d3d8e1f399..38814b10ad 100644
--- a/ui-ngx/src/app/core/services/menu.models.ts
+++ b/ui-ngx/src/app/core/services/menu.models.ts
@@ -804,6 +804,14 @@ const defaultUserMenuMap = new Map<Authority, MenuReference[]>([
           {id: MenuId.notification_rules}
         ]
       },
+      {
+        id: MenuId.mobile_center,
+        pages: [
+          {id: MenuId.mobile_apps},
+          {id: MenuId.mobile_bundles},
+          {id: MenuId.mobile_qr_code_widget}
+        ]
+      },
       {id: MenuId.api_usage},
       {
         id: MenuId.settings,
@@ -817,7 +825,13 @@ const defaultUserMenuMap = new Map<Authority, MenuReference[]>([
       {
         id: MenuId.security_settings,
         pages: [
-          {id: MenuId.audit_log}
+          {id: MenuId.audit_log},
+          {
+            id: MenuId.oauth2,
+            pages: [
+              {id: MenuId.clients}
+            ]
+          }
         ]
       }
     ]
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/oauth2-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/oauth2-routing.module.ts
index 9286304312..a45c1440a7 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/oauth2-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/oauth2-routing.module.ts
@@ -44,7 +44,7 @@ export const oAuth2Routes: Routes = [
     path: 'oauth2',
     component: RouterTabsComponent,
     data: {
-      auth: [Authority.SYS_ADMIN],
+      auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
       breadcrumb: {
         label: 'admin.oauth2.oauth2',
         icon: 'mdi:shield-account'
@@ -55,8 +55,11 @@ export const oAuth2Routes: Routes = [
         path: '',
         children: [],
         data: {
-          auth: [Authority.SYS_ADMIN],
-          redirectTo: '/security-settings/oauth2/domains'
+          auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
+          redirectTo: {
+            SYS_ADMIN: '/security-settings/oauth2/domains',
+            TENANT_ADMIN: '/security-settings/oauth2/clients'
+          }
         }
       },
       {
@@ -86,7 +89,7 @@ export const oAuth2Routes: Routes = [
             path: '',
             component: EntitiesTableComponent,
             data: {
-              auth: [Authority.SYS_ADMIN],
+              auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
               title: 'admin.oauth2.clients'
             },
             resolve: {
@@ -104,7 +107,7 @@ export const oAuth2Routes: Routes = [
                     labelFunction: entityDetailsPageBreadcrumbLabelFunction,
                     icon: 'public'
                   } as BreadCrumbConfig<EntityDetailsPageComponent>,
-                  auth: [Authority.SYS_ADMIN],
+                  auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
                   title: 'admin.oauth2.clients',
                   hideTabs: true,
                   backNavigationCommands: ['../..']