diff --git a/client/src/components/dashboard/Dashboard.js b/client/src/components/dashboard/Dashboard.js index 4108191..3efe0e0 100644 --- a/client/src/components/dashboard/Dashboard.js +++ b/client/src/components/dashboard/Dashboard.js @@ -276,11 +276,13 @@ const Dashboard = () => { {/* Customer List Section */} -
-
- + {AuthService.canViewCustomers() && ( +
+
+ +
-
+ )}
{/* Right Side Bar - 1/4 width */} diff --git a/client/src/components/home/menu.js b/client/src/components/home/menu.js index d5db68c..c4d1fe7 100644 --- a/client/src/components/home/menu.js +++ b/client/src/components/home/menu.js @@ -20,7 +20,7 @@ const SideMenu = () => { name: 'Dashboard', link: '/dashboard/dashboard', category: '/dashboard/dashboard', - roleFunc: AuthService.canViewRoutes + roleFunc: AuthService.canViewDashboard }, { name: 'Admin View', diff --git a/client/src/services/AuthService.js b/client/src/services/AuthService.js index 5709230..1b78fec 100644 --- a/client/src/services/AuthService.js +++ b/client/src/services/AuthService.js @@ -35,6 +35,15 @@ const hasAnyPermission = (permissionKeys = []) => { return permissionKeys.some((permissionKey) => permissionSet.has(permissionKey)); }; +const canViewDashboard = () => { + return hasAnyPermission([ + 'Dashboard', + 'View_Transportation Schedule_Route Overview', + 'Create&Edit_Transportation Schedule', + 'Export_Transportation Schedule Report' + ]); +} + const isAdmin = () => { return hasPermission('Set Permission for Employee'); } @@ -214,6 +223,7 @@ export const AuthService = { login, logout, hasPermission, + canViewDashboard, isAdmin, canCreateOrEditDrivers, getLocalAccessToken,