fixed build errors

the-orange-alliance · Apr 17, 2024 · 74f89a6 · 74f89a6
1 parent 6ba262c
commit 74f89a6
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 48 deletions.
diff --git a/front-end/src/apps/Settings/index.tsx b/front-end/src/apps/Settings/index.tsx
@@ -13,7 +13,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import {
   currentEventKeyAtom,
   currentTournamentKeyAtom
-} from 'src/stores/NewRecoil';
+} from 'src/stores/recoil';
 import { Tournament } from '@toa-lib/models';
 import FrcFmsSettingsTab from './tabs/frc-fms';
 // import FrcFmsSettingsTab from './tabs/frc-fms';

diff --git a/front-end/src/apps/Settings/tabs/audience.tsx b/front-end/src/apps/Settings/tabs/audience.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react';
 import Box from '@mui/material/Box';
 import { useRecoilState } from 'recoil';
-import { displayChromaKeyAtom } from 'src/stores/NewRecoil';
+import { displayChromaKeyAtom } from 'src/stores/recoil';
 import { TextSetting } from '../components/text-setting';
 import { updateSocketClient } from 'src/api/use-socket-data';
 

diff --git a/front-end/src/apps/reports/reports-app.tsx b/front-end/src/apps/reports/reports-app.tsx
@@ -10,7 +10,7 @@ import { TournamentReports } from './tournament-reports';
 import {
   currentEventKeyAtom,
   currentTournamentKeyAtom
-} from 'src/stores/NewRecoil';
+} from 'src/stores/recoil';
 import { useTournamentsForEvent } from 'src/api/use-tournament-data';
 import TournamentDropdown from 'src/components/dropdowns/tournament-dropdown';
 

diff --git a/front-end/src/components/Dialogs/LoginDialog/LoginDialog.tsx b/front-end/src/components/Dialogs/LoginDialog/LoginDialog.tsx
@@ -13,7 +13,7 @@ import { useSetRecoilState } from 'recoil';
 import { login } from 'src/api/use-login-data';
 import { useSocket } from 'src/api/use-socket';
 import useLocalStorage from 'src/stores/LocalStorage';
-import { userAtom } from 'src/stores/NewRecoil';
+import { userAtom } from 'src/stores/recoil';
 
 interface Props {
   open: boolean;

diff --git a/front-end/src/components/buttons/LogoutButton/LogoutButton.tsx b/front-end/src/components/buttons/LogoutButton/LogoutButton.tsx
@@ -4,7 +4,7 @@ import { FC } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { logout } from 'src/api/use-login-data';
 import useLocalStorage from 'src/stores/LocalStorage';
-import { userAtom } from 'src/stores/NewRecoil';
+import { userAtom } from 'src/stores/recoil';
 
 const LogoutButton: FC = () => {
   const setUser = useSetRecoilState(userAtom);

diff --git a/front-end/src/hooks/use-season-components.ts b/front-end/src/hooks/use-season-components.ts
@@ -1,7 +1,7 @@
 import { getSeasonKeyFromEventKey } from '@toa-lib/models';
 import { useRecoilValue } from 'recoil';
 import { useComponents } from 'src/seasons';
-import { currentEventKeyAtom } from 'src/stores/NewRecoil';
+import { currentEventKeyAtom } from 'src/stores/recoil';
 
 export const useSeasonComponents = () => {
   const seasonKey = getSeasonKeyFromEventKey(

diff --git a/front-end/src/layouts/DefaultLayout.tsx b/front-end/src/layouts/DefaultLayout.tsx
@@ -13,7 +13,7 @@ import IconButton from '@mui/material/IconButton';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import LoginButton from 'src/components/buttons/LoginButton/LoginButton';
-import { userAtom } from '@stores/NewRecoil';
+import { userAtom } from '@stores/recoil';
 import emsAvatar from '@assets/favicon.ico';
 import LogoutButton from 'src/components/buttons/LogoutButton/LogoutButton';
 import NotificationsIcon from '@mui/icons-material/Notifications';

diff --git a/front-end/src/layouts/PaperLayout.tsx b/front-end/src/layouts/PaperLayout.tsx
@@ -14,7 +14,7 @@ import Paper from '@mui/material/Paper';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import LoginButton from 'src/components/buttons/LoginButton/LoginButton';
-import { userAtom } from '@stores/NewRecoil';
+import { userAtom } from '@stores/recoil';
 import emsAvatar from '@assets/favicon.ico';
 import LogoutButton from 'src/components/buttons/LogoutButton/LogoutButton';
 

diff --git a/front-end/src/layouts/RefereeLayout.tsx b/front-end/src/layouts/RefereeLayout.tsx
@@ -12,7 +12,7 @@ import IconButton from '@mui/material/IconButton';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import LoginButton from 'src/components/buttons/LoginButton/LoginButton';
-import { userAtom } from '@stores/NewRecoil';
+import { userAtom } from '@stores/recoil';
 import emsAvatar from '@assets/favicon.ico';
 import LogoutButton from 'src/components/buttons/LogoutButton/LogoutButton';
 

diff --git a/front-end/src/seasons/ChargedUp/referee/AutoScoreSheet.tsx b/front-end/src/seasons/ChargedUp/referee/AutoScoreSheet.tsx
@@ -9,7 +9,7 @@ import {
 } from '@toa-lib/models';
 import StateToggle from 'src/components/inputs/StateToggle';
 import { SetterOrUpdater, useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import NumberInput from 'src/components/inputs/NumberInput';
 
 interface Props {
@@ -22,7 +22,7 @@ const AutoScoreSheet: FC<Props> = ({ alliance, participants, onUpdate }) => {
   const [match, setMatch]: [
     Match<ChargedUpDetails> | null,
     SetterOrUpdater<Match<ChargedUpDetails> | null>
-  ] = useRecoilState(matchInProgressAtom);
+  ] = useRecoilState(matchOccurringAtom);
 
   if (!match || !match.details) return null;
 

diff --git a/front-end/src/seasons/ChargedUp/referee/PenaltySheet.tsx b/front-end/src/seasons/ChargedUp/referee/PenaltySheet.tsx
@@ -4,15 +4,15 @@ import Typography from '@mui/material/Typography';
 import NumberInput from 'src/components/inputs/NumberInput';
 import { Alliance, ChargedUpDetails, Match } from '@toa-lib/models';
 import { useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 
 interface Props {
   alliance: Alliance;
   onUpdate?: (match: Match<ChargedUpDetails>) => void;
 }
 
 const PenaltySheet: FC<Props> = ({ alliance, onUpdate }) => {
-  const [match, setMatch] = useRecoilState(matchInProgressAtom);
+  const [match, setMatch] = useRecoilState(matchOccurringAtom);
 
   const handleFoulChange = (minPen: number) => {
     if (match) {

diff --git a/front-end/src/seasons/ChargedUp/referee/ScoreSheet.tsx b/front-end/src/seasons/ChargedUp/referee/ScoreSheet.tsx
@@ -13,7 +13,7 @@ import {
 import ConnectionChip from 'src/components/util/ConnectionChip/ConnectionChip';
 import MatchChip from 'src/components/util/MatchChip/MatchChip';
 import { useRecoilValue } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import TeamSheet from './TeamSheet';
 import PenaltySheet from './PenaltySheet';
 import TabPanel from 'src/components/util/TabPanel/TabPanel';
@@ -27,7 +27,7 @@ interface Props {
 
 const ScoreSheet: FC<Props> = ({ alliance }) => {
   const [socket] = useSocket();
-  const match = useRecoilValue(matchInProgressAtom);
+  const match = useRecoilValue(matchOccurringAtom);
 
   const [tabIndex, setTabIndex] = useState(0);
 

diff --git a/front-end/src/seasons/ChargedUp/referee/TeamSheet.tsx b/front-end/src/seasons/ChargedUp/referee/TeamSheet.tsx
@@ -3,10 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import Box from '@mui/material/Box';
 import ToggleButton from '@mui/material/ToggleButton';
 import Typography from '@mui/material/Typography';
-import {
-  matchInProgressAtom,
-  matchInProgressParticipantsByStationSelectorFam
-} from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import { useSocket } from 'src/api/use-socket';
 import { MatchSocketEvent } from '@toa-lib/models';
 
@@ -16,7 +13,7 @@ interface Props {
 
 const TeamSheet: FC<Props> = ({ station }) => {
   const [socket] = useSocket();
-  const match = useRecoilValue(matchInProgressAtom);
+  const match = useRecoilValue(matchOccurringAtom);
   const [participant, setParticipant] = useRecoilState(
     matchInProgressParticipantsByStationSelectorFam(station)
   );

diff --git a/front-end/src/seasons/ChargedUp/referee/TeleOpScoreSheet.tsx b/front-end/src/seasons/ChargedUp/referee/TeleOpScoreSheet.tsx
@@ -9,7 +9,7 @@ import {
 } from '@toa-lib/models';
 import StateToggle from 'src/components/inputs/StateToggle';
 import { SetterOrUpdater, useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import NumberInput from 'src/components/inputs/NumberInput';
 
 interface Props {
@@ -22,7 +22,7 @@ const TeleScoreSheet: FC<Props> = ({ alliance, participants, onUpdate }) => {
   const [match, setMatch]: [
     Match<ChargedUpDetails> | null,
     SetterOrUpdater<Match<ChargedUpDetails> | null>
-  ] = useRecoilState(matchInProgressAtom);
+  ] = useRecoilState(matchOccurringAtom);
 
   if (!match || !match.details) return null;
 

diff --git a/front-end/src/seasons/Crescendo/referee/AutoScoreSheet.tsx b/front-end/src/seasons/Crescendo/referee/AutoScoreSheet.tsx
@@ -4,7 +4,7 @@ import Typography from '@mui/material/Typography';
 import { Alliance, Crescendo, Match, MatchParticipant } from '@toa-lib/models';
 import StateToggle from 'src/components/inputs/StateToggle';
 import { SetterOrUpdater, useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import NumberInput from 'src/components/inputs/NumberInput';
 
 interface Props {
@@ -17,7 +17,7 @@ const AutoScoreSheet: FC<Props> = ({ alliance, participants, onUpdate }) => {
   const [match, setMatch]: [
     Match<Crescendo.MatchDetails> | null,
     SetterOrUpdater<Match<Crescendo.MatchDetails> | null>
-  ] = useRecoilState(matchInProgressAtom);
+  ] = useRecoilState(matchOccurringAtom);
 
   if (!match || !match.details) return null;
 

diff --git a/front-end/src/seasons/Crescendo/referee/PenaltySheet.tsx b/front-end/src/seasons/Crescendo/referee/PenaltySheet.tsx
@@ -4,15 +4,15 @@ import Typography from '@mui/material/Typography';
 import NumberInput from 'src/components/inputs/NumberInput';
 import { Alliance, Crescendo, Match } from '@toa-lib/models';
 import { useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 
 interface Props {
   alliance: Alliance;
   onUpdate?: (match: Match<Crescendo.MatchDetails>) => void;
 }
 
 const PenaltySheet: FC<Props> = ({ alliance, onUpdate }) => {
-  const [match, setMatch] = useRecoilState(matchInProgressAtom);
+  const [match, setMatch] = useRecoilState(matchOccurringAtom);
 
   const handleFoulChange = (minPen: number) => {
     if (minPen < 0) minPen = 0;

diff --git a/front-end/src/seasons/Crescendo/referee/ScoreSheet.tsx b/front-end/src/seasons/Crescendo/referee/ScoreSheet.tsx
@@ -8,7 +8,7 @@ import { Alliance, Crescendo, Match, MatchSocketEvent } from '@toa-lib/models';
 import ConnectionChip from 'src/components/util/ConnectionChip/ConnectionChip';
 import MatchChip from 'src/components/util/MatchChip/MatchChip';
 import { useRecoilValue } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import TeamSheet from './TeamSheet';
 import PenaltySheet from './PenaltySheet';
 import TabPanel from 'src/components/util/TabPanel/TabPanel';
@@ -22,7 +22,7 @@ interface Props {
 
 const ScoreSheet: FC<Props> = ({ alliance }) => {
   const [socket] = useSocket();
-  const match = useRecoilValue(matchInProgressAtom);
+  const match = useRecoilValue(matchOccurringAtom);
 
   const [tabIndex, setTabIndex] = useState(0);
 

diff --git a/front-end/src/seasons/Crescendo/referee/TeamSheet.tsx b/front-end/src/seasons/Crescendo/referee/TeamSheet.tsx
@@ -3,10 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import Box from '@mui/material/Box';
 import ToggleButton from '@mui/material/ToggleButton';
 import Typography from '@mui/material/Typography';
-import {
-  matchInProgressAtom,
-  matchInProgressParticipantsByStationSelectorFam
-} from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import { useSocket } from 'src/api/use-socket';
 import { MatchSocketEvent } from '@toa-lib/models';
 
@@ -16,7 +13,7 @@ interface Props {
 
 const TeamSheet: FC<Props> = ({ station }) => {
   const [socket] = useSocket();
-  const match = useRecoilValue(matchInProgressAtom);
+  const match = useRecoilValue(matchOccurringAtom);
   const [participant, setParticipant] = useRecoilState(
     matchInProgressParticipantsByStationSelectorFam(station)
   );

diff --git a/front-end/src/seasons/Crescendo/referee/TeleOpScoreSheet.tsx b/front-end/src/seasons/Crescendo/referee/TeleOpScoreSheet.tsx
@@ -19,10 +19,10 @@ import {
 } from 'recoil';
 import {
   blueBonusActiveAtom,
-  matchInProgressAtom,
+  matchOccurringAtom,
   matchStateAtom,
   redBonusActiveAtom
-} from '@stores/NewRecoil';
+} from '@stores/recoil';
 import NumberInput from 'src/components/inputs/NumberInput';
 import { useSocket } from 'src/api/use-socket';
 
@@ -36,7 +36,7 @@ const TeleScoreSheet: FC<Props> = ({ alliance, participants, onUpdate }) => {
   const [match, setMatch]: [
     Match<Crescendo.MatchDetails> | null,
     SetterOrUpdater<Match<Crescendo.MatchDetails> | null>
-  ] = useRecoilState(matchInProgressAtom);
+  ] = useRecoilState(matchOccurringAtom);
   const matchState = useRecoilValue(matchStateAtom);
 
   const [socket, connected] = useSocket();

diff --git a/front-end/src/seasons/HydrogenHorizons/referee/PenaltySheet.tsx b/front-end/src/seasons/HydrogenHorizons/referee/PenaltySheet.tsx
@@ -4,7 +4,7 @@ import Typography from '@mui/material/Typography';
 import NumberInput from 'src/components/inputs/NumberInput';
 import { Alliance, HydrogenHorizons, Match } from '@toa-lib/models';
 import { useRecoilValue } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 
 interface Props {
   alliance: Alliance;
@@ -15,7 +15,7 @@ interface Props {
 }
 
 const PenaltySheet: FC<Props> = ({ alliance, onMatchItemUpdate }) => {
-  const match = useRecoilValue(matchInProgressAtom);
+  const match = useRecoilValue(matchOccurringAtom);
 
   const handleFoulChange = (minPen: number) => {
     onMatchItemUpdate(alliance === 'red' ? 'redMinPen' : 'blueMinPen', minPen);

diff --git a/front-end/src/seasons/HydrogenHorizons/referee/ScoreSheet.tsx b/front-end/src/seasons/HydrogenHorizons/referee/ScoreSheet.tsx
@@ -2,7 +2,7 @@ import { FC, SyntheticEvent, useState } from 'react';
 import { RefereeScoreSheetProps } from '@seasons/index';
 import { useSocket } from 'src/api/use-socket';
 import { SetterOrUpdater, useRecoilState } from 'recoil';
-import { matchInProgressAtom } from '@stores/NewRecoil';
+import { matchOccurringAtom } from '@stores/recoil';
 import {
   HydrogenHorizons,
   Match,
@@ -27,7 +27,7 @@ const ScoreSheet: FC<RefereeScoreSheetProps> = ({ alliance }) => {
   const [match, setMatch]: [
     Match<HydrogenHorizons.MatchDetails> | null,
     SetterOrUpdater<Match<HydrogenHorizons.MatchDetails> | null>
-  ] = useRecoilState(matchInProgressAtom);
+  ] = useRecoilState(matchOccurringAtom);
 
   const [tabIndex, setTabIndex] = useState(0);
 

diff --git a/front-end/src/seasons/HydrogenHorizons/referee/TeamSheet.tsx b/front-end/src/seasons/HydrogenHorizons/referee/TeamSheet.tsx
@@ -3,7 +3,6 @@ import { useRecoilState } from 'recoil';
 import Box from '@mui/material/Box';
 import ToggleButton from '@mui/material/ToggleButton';
 import Typography from '@mui/material/Typography';
-import { matchInProgressParticipantsByStationSelectorFam } from '@stores/NewRecoil';
 import { CardStatusUpdate, MatchSocketEvent } from '@toa-lib/models';
 import { useSocket } from 'src/api/use-socket';
 import { useTeamIdentifiers } from 'src/hooks/use-team-identifier';

diff --git a/front-end/src/seasons/HydrogenHorizons/referee/TeleOpScoreSheet.tsx b/front-end/src/seasons/HydrogenHorizons/referee/TeleOpScoreSheet.tsx
@@ -9,16 +9,14 @@ import {
 } from '@toa-lib/models';
 import StateToggle from 'src/components/inputs/StateToggle';
 import { useRecoilValue } from 'recoil';
-import {
-  currentTeamsByEventSelector,
-  matchInProgressAtom
-} from '@stores/NewRecoil';
 import NumberInput from 'src/components/inputs/NumberInput';
 import {
   AlignmentStatus,
   Proficiency
 } from '@toa-lib/models/build/seasons/HydrogenHorizons';
 import { useTeamIdentifiers } from 'src/hooks/use-team-identifier';
+import { matchOccurringAtom } from 'src/stores/recoil';
+import { useTeamsForEvent } from 'src/api/use-team-data';
 
 interface Props {
   alliance: Alliance;
@@ -40,8 +38,8 @@ const TeleScoreSheet: FC<Props> = ({
   onMatchDetailsUpdate
 }) => {
   const match: Match<HydrogenHorizons.MatchDetails> | null =
-    useRecoilValue(matchInProgressAtom);
-  const teams = useRecoilValue(currentTeamsByEventSelector);
+    useRecoilValue(matchOccurringAtom);
+  const { data: teams } = useTeamsForEvent(match?.eventKey ?? '');
   const identifiers = useTeamIdentifiers();
 
   if (!match || !match.details) return null;
@@ -193,7 +191,7 @@ const TeleScoreSheet: FC<Props> = ({
         />
       </Grid>
       {participants?.map((p) => {
-        const team = teams.find((t) => t.teamKey === p.teamKey);
+        const team = teams?.find((t) => t.teamKey === p.teamKey);
         const update = (value: Proficiency) => {
           updateProficiency(p.station, value);
         };