From 4924ee46908397b02cd3b0e6ae87993a09a8a6c9 Mon Sep 17 00:00:00 2001
From: Josh Thoo Jen Sen <110712708+josh1248@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:40:08 +0800
Subject: [PATCH] Transfer groundControl from staff to admin route (#3043)

* Transfer groundControl from staff to admin route

* Update snapshots

* Lint

* Revert accidental changes to RequestsSaga

* Find-replace non-admin API calls to backend

* Change backend route for Admin Panel calls

* Revert "Find-replace non-admin API calls to backend"

This reverts commit eabc9002b1b9fa99fef7764bec253132522b54c1.
---
 .../subcomponents/AcademyNavigationBar.tsx            |  2 +-
 .../subcomponents/__tests__/AcademyNavigationBar.tsx  | 11 ++---------
 .../__snapshots__/AcademyNavigationBar.tsx.snap       |  2 +-
 src/pages/academy/academyRoutes.tsx                   |  8 ++++----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/commons/navigationBar/subcomponents/AcademyNavigationBar.tsx b/src/commons/navigationBar/subcomponents/AcademyNavigationBar.tsx
index 1488814ac2..03e85ea9f6 100644
--- a/src/commons/navigationBar/subcomponents/AcademyNavigationBar.tsx
+++ b/src/commons/navigationBar/subcomponents/AcademyNavigationBar.tsx
@@ -91,7 +91,7 @@ const getStaffNavlinkInfo = ({
       to: `/courses/${courseId}/groundcontrol`,
       icon: IconNames.SATELLITE,
       text: 'Ground Control',
-      disabled: !isStaffOrAdmin,
+      disabled: !isAdmin,
       hiddenInBreakpoints: ['xs', 'sm']
     },
     {
diff --git a/src/commons/navigationBar/subcomponents/__tests__/AcademyNavigationBar.tsx b/src/commons/navigationBar/subcomponents/__tests__/AcademyNavigationBar.tsx
index 435c6c7d52..1be483f623 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/AcademyNavigationBar.tsx
+++ b/src/commons/navigationBar/subcomponents/__tests__/AcademyNavigationBar.tsx
@@ -11,15 +11,8 @@ jest.mock('react-redux', () => ({
 const useSelectorMock = useTypedSelector as jest.Mock;
 
 const assessmentTypes = ['Missions', 'Quests', 'Paths', 'Contests', 'Others'];
-const staffRoutes = [
-  'grading',
-  'groundcontrol',
-  'sourcereel',
-  'gamesimulator',
-  'dashboard',
-  'teamformation'
-];
-const adminRoutes = ['adminpanel'];
+const staffRoutes = ['grading', 'sourcereel', 'gamesimulator', 'dashboard', 'teamformation'];
+const adminRoutes = ['groundcontrol', 'adminpanel'];
 const courseId = 0;
 const createCoursePath = (path: string) => `/courses/${courseId}/${path}`;
 
diff --git a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/AcademyNavigationBar.tsx.snap b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/AcademyNavigationBar.tsx.snap
index c9cf0071ef..f13fe09c95 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/AcademyNavigationBar.tsx.snap
+++ b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/AcademyNavigationBar.tsx.snap
@@ -419,7 +419,7 @@ exports[`MissionControl, GroundControl, Sourcereel, GameSimulator, Dashboard, Te
     align="right"
   >
     <DesktopNavLink
-      disabled={false}
+      disabled={true}
       hiddenInBreakpoints={
         Array [
           "xs",
diff --git a/src/pages/academy/academyRoutes.tsx b/src/pages/academy/academyRoutes.tsx
index 0435bfaf9e..d4cc0338d0 100644
--- a/src/pages/academy/academyRoutes.tsx
+++ b/src/pages/academy/academyRoutes.tsx
@@ -87,7 +87,6 @@ const TeamFormationImport = () => import('./teamFormation/subcomponents/TeamForm
 const Dashboard = () => import('./dashboard/Dashboard');
 
 const staffRoutes: RouteObject[] = [
-  { path: 'groundcontrol', lazy: GroundControl },
   { path: `grading/${gradingRegExp}`, lazy: Grading },
   { path: 'sourcereel', lazy: Sourcereel },
   { path: 'gamesimulator', lazy: GameSimulator },
@@ -107,9 +106,10 @@ const staffRoutes: RouteObject[] = [
 
 const AdminPanel = () => import('./adminPanel/AdminPanel');
 
-const adminRoutes: RouteObject[] = [{ path: 'adminpanel', lazy: AdminPanel }].map(r =>
-  new GuardedRoute(r).check(s => s.session.role === Role.Admin, notFoundPath).build()
-);
+const adminRoutes: RouteObject[] = [
+  { path: 'groundcontrol', lazy: GroundControl },
+  { path: 'adminpanel', lazy: AdminPanel }
+].map(r => new GuardedRoute(r).check(s => s.session.role === Role.Admin, notFoundPath).build());
 
 export const getAcademyRoutes = (): RouteObject[] => {
   const routes: RouteObject[] = [...getCommonAcademyRoutes(), ...staffRoutes, ...adminRoutes];