From 4264377a3dcfd2b58c8f7c22fb03e2a92c9a4b6e Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Fri, 3 Nov 2023 15:59:01 +0530
Subject: [PATCH] Fix issues with admin ui loading based on permissions

---
 portals/admin/src/main/webapp/site/public/conf/settings.json  | 4 ++--
 .../src/app/components/AdminPages/Dashboard/Dashboard.jsx     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/portals/admin/src/main/webapp/site/public/conf/settings.json b/portals/admin/src/main/webapp/site/public/conf/settings.json
index 8cb4dcab2d6..68cef408d4e 100644
--- a/portals/admin/src/main/webapp/site/public/conf/settings.json
+++ b/portals/admin/src/main/webapp/site/public/conf/settings.json
@@ -22,12 +22,12 @@
     "docUrl": "https://apim.docs.wso2.com/en/4.2.0/",
     "roles": {
       "workflowManager": ["apim:api_workflow_view", "apim:api_workflow_approve", "apim:tenantInfo", "openid", "apim:admin_settings"],
-      "policyManager": ["apim:tier_view","apim:policies_import_export", "apim:tier_manage", "apim:tenantInfo",
+      "policyManager": ["apim:admin_tier_view", "apim:admin_tier_manage", "apim:tenantInfo",
          "apim:bl_view", "apim:bl_manage", "openid", "apim:admin_settings"],
       "categoriesManager": ["apim:api_category", "openid", "apim:tenantInfo", "apim:admin_settings"],
       "keyManagers": ["apim:keymanagers_manage", "openid", "apim:tenantInfo", "apim:admin_settings"],
       "gatewayManager": ["apim:environment_manage", "openid", "apim:admin_settings", "apim:environment_read"],
-      "settingsManager": ["apim:app_owner_change", "apim:app_import_export", "apim:admin_application_view","apim:scope_manage", "openid", 
+      "settingsManager": ["apim:app_owner_change", "apim:admin_application_view","apim:scope_manage", "openid", 
                           "apim:admin_settings", "apim:tenantInfo"]
       }
   }
diff --git a/portals/admin/src/main/webapp/source/src/app/components/AdminPages/Dashboard/Dashboard.jsx b/portals/admin/src/main/webapp/source/src/app/components/AdminPages/Dashboard/Dashboard.jsx
index 065e437dd81..e45f6960ea5 100644
--- a/portals/admin/src/main/webapp/source/src/app/components/AdminPages/Dashboard/Dashboard.jsx
+++ b/portals/admin/src/main/webapp/source/src/app/components/AdminPages/Dashboard/Dashboard.jsx
@@ -31,8 +31,8 @@ import { useAppContext } from 'AppComponents/Shared/AppContext';
 export default function Dashboard() {
     const { user: { _scopes } } = useAppContext();
     const hasWorkflowViewPermission = _scopes.includes('apim:api_workflow_view');
-    const hasPolicyViewPermission = _scopes.includes('apim:tier_view');
-    const hasAPICategoryViewPermission = _scopes.includes('apim:admin_operations');
+    const hasPolicyViewPermission = _scopes.includes('apim:admin_tier_view');
+    const hasAPICategoryViewPermission = _scopes.includes('apim:api_category');
     return (
         <ContentBase width='full' title='Dashboard' pageStyle='paperLess'>
             <Grid container spacing={3} justify='center'>