From c3e0cdd7e6e2c2adc8dc1a4cbf13466ea5299001 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Fri, 5 Mar 2021 06:10:10 +0100
Subject: [PATCH] #1670 #1766 Rearrange admin menu and take into account
 managePattern, manageTaxonomy and managePlatform in the app.index route

---
 .../scripts/services/api/AuthenticationSrv.js |  6 +++++
 .../app/scripts/services/api/ProfileSrv.js    | 22 ++++++++++---------
 .../views/components/header.component.html    |  5 ++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/app/scripts/services/api/AuthenticationSrv.js b/frontend/app/scripts/services/api/AuthenticationSrv.js
index 8ab43fe9ac..efd4125f84 100644
--- a/frontend/app/scripts/services/api/AuthenticationSrv.js
+++ b/frontend/app/scripts/services/api/AuthenticationSrv.js
@@ -79,6 +79,12 @@
                             return 'app.administration.analyzer-templates';
                         } else if(self.hasPermission('manageObservableTemplate')) {
                             return 'app.administration.observables';
+                        } else if(self.hasPermission('managePlatform')) {
+                            return 'app.administration.platform';
+                        } else if(self.hasPermission('manageTaxonomy')) {
+                            return 'app.administration.taxonomies';
+                        } else if(self.hasPermission('managePattern')) {
+                            return 'app.administration.attackPatterns';
                         }
                     } else {
                         return 'app.cases';
diff --git a/frontend/app/scripts/services/api/ProfileSrv.js b/frontend/app/scripts/services/api/ProfileSrv.js
index 715039252e..3a1becdfac 100644
--- a/frontend/app/scripts/services/api/ProfileSrv.js
+++ b/frontend/app/scripts/services/api/ProfileSrv.js
@@ -11,26 +11,28 @@
                 admin: {
                     hints: 'Permissions for administration user profiles',
                     keys: [
-                        'managePlatform',
-                        'manageUser',
                         'manageOrganisation',
+                        'manageProfile',
+                        'manageUser',
                         'manageCustomField',
                         'manageConfig',
-                        'manageTaxonomy',
-                        'manageProfile',
                         'manageAnalyzerTemplate',
-                        'manageObservableTemplate'
+                        'manageObservableTemplate',
+                        'manageTaxonomy',
+                        'managePattern',
+                        'managePlatform'
                     ],
                     labels: {
-                        managePlatform: 'Manage the platform',
-                        manageUser: 'Manage users',
                         manageOrganisation: 'Manage organisations',
+                        manageProfile: 'Manage profiles',
+                        manageUser: 'Manage users',
                         manageCustomField: 'Manage custom fields',
                         manageConfig: 'Manage configurations',
-                        manageTaxonomy: 'Manage taxonomies',
-                        manageProfile: 'Manage profiles',
                         manageAnalyzerTemplate: 'Manage analyzer templates',
-                        manageObservableTemplate: 'Manage observable types'
+                        manageObservableTemplate: 'Manage observable types',
+                        manageTaxonomy: 'Manage taxonomies',
+                        managePattern: 'Manage attack patterns',
+                        managePlatform: 'Manage the platform'
                     }
                 },
                 org: {
diff --git a/frontend/app/views/components/header.component.html b/frontend/app/views/components/header.component.html
index 2b99662bee..09d31c3719 100644
--- a/frontend/app/views/components/header.component.html
+++ b/frontend/app/views/components/header.component.html
@@ -110,21 +110,20 @@
                                 <span class="hpad5">Analyzer templates</span>
                             </a>
                         </li>
-                        <li class="divider"></li>
                         <li if-permission="manageTaxonomy">
                             <a ui-sref="app.administration.taxonomies">
                                 <i class="fa fa-tags"></i>
                                 <span class="hpad5">Taxonomies</span>
                             </a>
                         </li>
-                        <li>
+                        <li if-permission="managePattern">
                             <a ui-sref="app.administration.attackPatterns">
                                 <i class="fa fa-tags"></i>
                                 <span class="hpad5">ATT&CK Patterns</span>
                             </a>
                         </li>
                         <li class="divider"></li>
-                        <li>
+                        <li if-permission="managePlatform">
                             <a ui-sref="app.administration.platform">
                                 <i class="fa fa-wrench"></i>
                                 <span class="hpad5">Platform Status</span>