Realized I didn't need a route

Author: EdgarButtner

src/frontend/src/app/AppAuthenticated.tsx

@@ -122,7 +122,6 @@ const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId, userRole })
             <Route path={routes.CHANGE_REQUESTS} component={ChangeRequests} />
             <Route path={routes.GANTT} component={GanttChartPage} />
             <Route path={routes.TEAMS} component={Teams} />
-            <Route path={routes.DIVISIONS_BY_ID} component={GuestTeamPage} />
             <Route path={routes.SETTINGS} component={Settings} />
             <Route path={routes.ADMIN_TOOLS} component={AdminTools} />
             <Route path={routes.INFO} component={InfoPage} />

src/frontend/src/layouts/Sidebar/Sidebar.tsx

@@ -38,7 +38,6 @@ import QueryStatsIcon from '@mui/icons-material/QueryStats';
 import CurrencyExchangeIcon from '@mui/icons-material/CurrencyExchange';
 import ShoppingCartIcon from '@mui/icons-material/ShoppingCart';
 import { useState } from 'react';
-import { sub } from 'date-fns';
 
 interface SidebarProps {
   drawerOpen: boolean;
@@ -54,13 +53,12 @@ const Sidebar = ({ drawerOpen, setDrawerOpen, moveContent, setMoveContent }: Sid
   const { onGuestHomePage } = useHomePageContext();
   const { isError: teamsError, error: teamsErrorMsg, data: teams } = useAllTeamTypes();
 
-  // To be uncommented once guest divisions pages are developed
   const allTeams: LinkItem[] = (teams ?? []).map((team: TeamType) => {
     const IconComponent = MuiIcons[(team.iconName in MuiIcons ? team.iconName : 'Circle') as keyof typeof MuiIcons];
     return {
       name: team.name,
       icon: <IconComponent />,
-      route: routes.DIVISIONS + '/' + team.teamTypeId
+      route: routes.TEAMS + '/' + team.teamTypeId
     };
   });
 

src/frontend/src/pages/GuestDivisionPage/GuestTeamPage.tsx

@@ -4,15 +4,13 @@ import { Box, useMediaQuery } from '@mui/system';
 import PageLayout from '../../components/PageLayout';
 import GuestSubteamCard from './GuestSubteamCard';
 import { useTeamsByTypeId } from '../../hooks/teams.hooks';
-import { useParams } from 'react-router-dom';
 
-interface ParamTypes {
+interface GuestTeamPageProps {
   teamTypeId: string;
 }
 
-const GuestTeamPage: React.FC = () => {
+const GuestTeamPage: React.FC<GuestTeamPageProps> = ({ teamTypeId }) => {
   const isMobilePortrait = useMediaQuery('(max-width:480px)');
-  const { teamTypeId } = useParams<ParamTypes>();
   const { isLoading: teamsIsLoading, isError: teamsIsError, data: teams, error: teamsError } = useTeamsByTypeId(teamTypeId);
 
   if (teamsIsLoading || !teams) return <LoadingIndicator />;

src/frontend/src/pages/TeamsPage/TeamSpecificPage.tsx

@@ -196,7 +196,7 @@ const TeamSpecificPage: React.FC = () => {
       }
       previousPages={
         isGuest(user.role) && data.teamType
-          ? [{ name: data.teamType.name, route: `${routes.DIVISIONS}/${data.teamType.teamTypeId}` }]
+          ? [{ name: data.teamType.name, route: `${routes.TEAMS}/${data.teamType.teamTypeId}` }]
           : [{ name: 'Teams', route: routes.TEAMS }]
       }
     >

src/frontend/src/pages/TeamsPage/Teams.tsx

@@ -7,11 +7,27 @@ import { Route, Switch } from 'react-router-dom';
 import { routes } from '../../utils/routes';
 import TeamsPage from './TeamsPage';
 import TeamSpecificPage from './TeamSpecificPage';
+import { useParams } from 'react-router-dom';
+import { useCurrentUser } from '../../hooks/users.hooks';
+import { isGuest } from 'shared';
+import { useAllTeamTypes } from '../../hooks/team-types.hooks';
+import GuestTeamPage from '../GuestDivisionPage/GuestTeamPage';
+
+const TeamOrDivisionPage: React.FC = () => {
+  const { teamId } = useParams<{ teamId: string }>();
+  const user = useCurrentUser();
+  const { data: teamTypes } = useAllTeamTypes();
+
+  if (isGuest(user.role) && teamTypes?.some((t) => t.teamTypeId === teamId)) {
+    return <GuestTeamPage teamTypeId={teamId} />;
+  }
+  return <TeamSpecificPage />;
+};
 
 const Teams: React.FC = () => {
   return (
     <Switch>
-      <Route path={routes.TEAMS_BY_ID} component={TeamSpecificPage} />
+      <Route path={routes.TEAMS_BY_ID} component={TeamOrDivisionPage} />
       <Route path={routes.TEAMS} component={TeamsPage} />
     </Switch>
   );

src/frontend/src/utils/routes.ts

@@ -41,10 +41,6 @@ const PROJECT_PART = PROJECTS_BY_WBS + '/part/:indexNum';
 const TEAMS = `/teams`;
 const TEAMS_BY_ID = TEAMS + `/:teamId`;
 
-/**************** Divisions Section ***************/
-const DIVISIONS = `/divisions`;
-const DIVISIONS_BY_ID = DIVISIONS + `/:teamTypeId`;
-
 /**************** Change Requests Section ****************/
 const CHANGE_REQUESTS = `/change-requests`;
 const ALL_CHANGE_REQUESTS = CHANGE_REQUESTS + `/all`;
@@ -100,9 +96,6 @@ export const routes = {
   TEAMS,
   TEAMS_BY_ID,
 
-  DIVISIONS,
-  DIVISIONS_BY_ID,
-
   GANTT,
 
   PROJECTS,