Update String-Ids-to-ObjectIds

.env.production

@@ -2,4 +2,5 @@
 # We have to include these at build time, so this file is used to inject them into the build process.
 NEXT_PUBLIC_API_URL=/api/
 NEXT_PUBLIC_SLACK_CLIENT_ID=10831824934.7404945710466
-NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=G-1BFJYBDC76
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=G-1BFJYBDC76
+NEXT_PUBLIC_RECAPTCHA_KEY=6Le63OUqAAAAABxxDrbaU9OywDLLHqutVwbw7a9d

.github/workflows/cd.yml

@@ -7,6 +7,8 @@ on:
         required: true
       AWS_SECRET_ACCESS_KEY:
         required: true
+      ROLLBAR_ACCESS_TOKEN:
+        required: true
   workflow_dispatch:
 
 permissions:
@@ -22,7 +24,7 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        
+
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
@@ -47,4 +49,4 @@ jobs:
         run: aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }} && aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && aws configure set region us-east-1
 
       - name: Deploy to ECS
-        run: aws ecs update-service --cluster gearbox --service gearbox --force-new-deployment
+        run: aws ecs update-service --cluster gearbox --service gearbox --force-new-deployment

.github/workflows/ci.yml

@@ -1,6 +1,13 @@
 name: CI
 
-on: [workflow_call, workflow_dispatch, pull_request]
+on:
+  workflow_call:
+    inputs:
+      deploy_id:
+        type: string
+        required: true
+  workflow_dispatch:
+  pull_request:
 
 jobs:
   build:
@@ -17,7 +24,9 @@ jobs:
         with:
           tags: ghcr.io/decatur-robotics/gearbox:latest
           outputs: type=docker,dest=/tmp/gearbox.tar
-
+          build-args: |
+            DEPLOY_ID=${{ inputs.deploy_id }}
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/notify_rollbar.yml

@@ -0,0 +1,35 @@
+name: Notify Rollbar
+
+on:
+  workflow_call:
+    secrets:
+      ROLLBAR_ACCESS_TOKEN:
+        required: true
+    outputs:
+      deploy_id:
+        value: ${{ jobs.notify.outputs.deploy_id }}
+  workflow_dispatch:
+
+permissions:
+  packages: write
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    environment: Production
+    outputs:
+      deploy_id: ${{ steps.rollbar_pre_deploy.outputs.deploy_id }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Notify deploy to Rollbar
+        uses: rollbar/[email protected]
+        id: rollbar_pre_deploy
+        with:
+          environment: "production"
+          version: ${{ github.sha }}
+          status: "started"
+        env:
+          ROLLBAR_ACCESS_TOKEN: ${{ secrets.ROLLBAR_ACCESS_TOKEN }}
+          ROLLBAR_USERNAME: ${{ github.actor }}

.github/workflows/onpush.yml

@@ -8,13 +8,22 @@
   workflow_dispatch:
 
 jobs:
+  notify_rollbar:
+    uses: ./.github/workflows/notify_rollbar.yml
+    secrets:
+      ROLLBAR_ACCESS_TOKEN: ${{ secrets.ROLLBAR_ACCESS_TOKEN }}
+
   ci:
+    needs: notify_rollbar
     uses: ./.github/workflows/ci.yml
+    with:
+      deploy_id: ${{ needs.notify_rollbar.outputs.deploy_id }}
 
   cd:
     needs:
       - ci
     uses: ./.github/workflows/cd.yml
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      ROLLBAR_ACCESS_TOKEN: ${{ secrets.ROLLBAR_ACCESS_TOKEN }}

Dockerfile

@@ -15,5 +15,9 @@ RUN npm run build
 
 EXPOSE 80
 
+ARG DEPLOY_ID
+
+ENV DEPLOY_ID=${DEPLOY_ID}
+
 # ENTRYPOINT [ "bash" ] # Uncomment to operate the terminal in the container
 CMD ["/usr/local/bin/npm", "run", "start"]

components/Container.tsx

@@ -74,11 +74,6 @@ export default function Container(props: ContainerProps) {
 	}, [eventSearch]);
 
 	useEffect(() => {
-		if (window.location.href.includes("signin")) {
-			console.log("triggered");
-			location.reload();
-		}
-
 		const loadTeams = async () => {
 			if (!user) {
 				return;
@@ -231,7 +226,7 @@ export default function Container(props: ContainerProps) {
 								</Link>
 							) : (
 								<a
-									href={"/api/auth/signin"}
+									href={"/signin"}
 									rel="noopener noreferrer"
 									target="_blank"
 								>
@@ -268,7 +263,7 @@ export default function Container(props: ContainerProps) {
 									<h2 className="card-title">Wait a minute...</h2>
 									<p>You need to sign in first!</p>
 									<div className="card-actions justify-end">
-										<Link href={"/api/auth/signin"}>
+										<Link href={"/signin"}>
 											<button className="btn btn-primary">Sign In</button>
 										</Link>
 									</div>

components/competition/EditMatchModal.tsx

@@ -47,6 +47,31 @@ export default function EditMatchModal(props: {
 			.then(loadMatches);
 	}
 
+	function changeTeamNumber(e: ChangeEvent<HTMLInputElement>, index: number) {
+		e.preventDefault();
+
+		const teamNumber = +e.target.value;
+		if (!teamNumber || !props.match?._id) return;
+
+		const reportId = props.match?.reports[index];
+		if (!props.reportsById[reportId]._id) return;
+
+		console.log(
+			`Changing team ${index} for match ${props.match?._id} to ${teamNumber}`,
+		);
+
+		api
+			.changeTeamNumberForReport(
+				match._id!.toString(),
+				props.reportsById[reportId]._id,
+				teamNumber,
+			)
+			.then(() => {
+				loadMatches();
+				loadReports();
+			});
+	}
+
 	return (
 		<dialog
 			id="edit-match-modal"
@@ -75,7 +100,13 @@ export default function EditMatchModal(props: {
 								<td className={index < 3 ? "text-blue-500" : "text-red-500"}>
 									{index < 3 ? "Blue" : "Red"} {(index % 3) + 1}
 								</td>
-								<td>{team}</td>
+								<td>
+									<input
+										onChange={(e) => changeTeamNumber(e, index)}
+										type="number"
+										defaultValue={team}
+									/>
+								</td>
 								<td>
 									<select onChange={(e) => changeScouter(e, reports[index])}>
 										{reports[index]?.user &&

components/competition/InsightsAndSettingsCard.tsx

@@ -82,8 +82,8 @@ export default function InsightsAndSettingsCard(props: {
 				Number(matchNumber),
 				0,
 				MatchType.Qualifying,
-				blueAlliance as number[],
 				redAlliance as number[],
+				blueAlliance as number[],
 			);
 		} catch (e) {
 			console.error(e);

components/competition/MatchScheduleCard.tsx

@@ -9,11 +9,12 @@ import {
 } from "@/lib/Types";
 import Link from "next/link";
 import { BsGearFill } from "react-icons/bs";
-import { FaSync, FaCheck } from "react-icons/fa";
+import { FaSync, FaCheck, FaInfoCircle } from "react-icons/fa";
 import { MdErrorOutline } from "react-icons/md";
 import Avatar from "../Avatar";
 import Loading from "../Loading";
 import { AdvancedSession } from "@/lib/client/useCurrentSession";
+import { useEffect } from "react";
 
 export default function MatchScheduleCard(props: {
 	team: Team | undefined;
@@ -62,11 +63,14 @@ export default function MatchScheduleCard(props: {
 		showSubmittedMatches,
 	} = props;
 
-	const displayedMatches = showSubmittedMatches
-		? matches
-		: matches.filter((match) =>
-				match.reports.some((reportId) => !reportsById[reportId]?.submitted),
-			);
+	const unsubmittedMatches: Match[] = [];
+
+	for (const match of matches) {
+		if (match.reports.some((reportId) => !reportsById[reportId]?.submitted))
+			unsubmittedMatches.push(match);
+	}
+
+	const displayedMatches = showSubmittedMatches ? matches : unsubmittedMatches;
 
 	return (
 		<div className="w-full card bg-base-200 shadow-xl ">
@@ -80,54 +84,37 @@ export default function MatchScheduleCard(props: {
 					)}
 				</h1>
 				{isManager &&
-				matchesAssigned === false &&
-				Object.keys(usersById).length >= 6 ? (
-					matchesAssigned !== undefined ? (
+					matchesAssigned === false &&
+					Object.keys(usersById).length >= 6 &&
+					(!assigningMatches ? (
 						<div className="opacity-100 font-bold text-warning flex flex-row items-center justify-start space-x-3">
-							<div>
-								{!assigningMatches
-									? "Matches are not assigned"
-									: "Assigning matches"}
-							</div>
-							{!assigningMatches ? (
-								<button
-									className={
-										"btn btn-primary btn-sm " +
-										(assigningMatches ? "disabled" : "")
-									}
-									onClick={assignScouters}
-								>
-									Assign Matches
-								</button>
-							) : (
-								<BsGearFill
-									size={30}
-									className="animate-spin-slow text-white"
-								/>
-							)}
+							<div>Matches are not assigned.</div>
+							<button
+								className={
+									"btn btn-primary btn-sm " +
+									(assigningMatches ? "disabled" : "")
+								}
+								onClick={assignScouters}
+							>
+								Assign Matches
+							</button>
 						</div>
 					) : (
 						<progress className="progress w-full" />
-					)
-				) : (
-					<></>
-				)}
+					))}
 				<div className="divider my-0"></div>
-				{loadingMatches || loadingReports || loadingUsers ? (
-					<div className="w-full flex flex-col items-center justify-center">
-						<BsGearFill
-							className="animate-spin-slow"
-							size={75}
-						/>
-						{loadingMatches && <h1>Loading Matches...</h1>}
-						{loadingReports && <h1>Loading Reports...</h1>}
-						{loadingUsers && <h1>Loading Users...</h1>}
-					</div>
-				) : (
+				{!(loadingMatches && loadingReports && loadingUsers) ? (
 					<div className="w-full flex flex-col items-center space-y-2">
 						{noMatches || matches.length === 0 ? (
 							<div className="flex flex-col items-center justify-center font-bold space-y-4">
-								<h1>No Match Schedule Available</h1>
+								{loadingMatches ? (
+									<>
+										<Loading size={72} />
+										<h1>Matches Loading</h1>
+									</>
+								) : (
+									<h1>No Match Schedule Available</h1>
+								)}
 								<button
 									onClick={reloadCompetition}
 									className="btn btn-lg btn-primary"
@@ -201,9 +188,9 @@ export default function MatchScheduleCard(props: {
 															<a
 																href={`/${team?.slug}/${seasonSlug}/${comp?.slug}/${reportId}`}
 																key={reportId}
-																className={`${color} ${mine && !submitted ? "border-4" : "border-2"} 
+																className={`${color} ${mine && !submitted ? "border-6  border-purple-500" : "border-2 border-white"} 
                                   ${timeSinceCheckIn && timeSinceCheckIn < 10 && "avatar online"} 
-                                  rounded-lg w-12 h-12 flex items-center justify-center text-white  border-white`}
+                                  rounded-lg w-12 h-12 flex items-center justify-center text-white`}
 															>
 																<h1>{report.robotNumber}</h1>
 															</a>
@@ -280,12 +267,26 @@ export default function MatchScheduleCard(props: {
 														) : (
 															<div>
 																Subjective Scouter:{" "}
-																{usersById[match.subjectiveScouter ?? ""].name}
+																{usersById[match.subjectiveScouter ?? ""].name}{" "}
+																<div
+																	className="tooltip before:w-[10rem] "
+																	data-tip="Subjective Scouters watch the entire match and comment on what's going on"
+																>
+																	<FaInfoCircle></FaInfoCircle>
+																</div>
 															</div>
 														)}
 													</div>
 												) : (
-													<div>No subjective scouter assigned</div>
+													<div>
+														No subjective scouter assigned{" "}
+														<div
+															className="tooltip before:w-[10rem] "
+															data-tip="Subjective Scouters watch the entire match and comment on what's going on"
+														>
+															<FaInfoCircle></FaInfoCircle>
+														</div>
+													</div>
 												)}
 											</div>
 											<a
@@ -312,6 +313,16 @@ export default function MatchScheduleCard(props: {
 							</div>
 						)}
 					</div>
+				) : (
+					<div className="w-full flex flex-col items-center justify-center">
+						<BsGearFill
+							className="animate-spin-slow"
+							size={75}
+						/>
+						{loadingMatches && <h1>Loading Matches...</h1>}
+						{loadingReports && <h1>Loading Reports...</h1>}
+						{loadingUsers && <h1>Loading Users...</h1>}
+					</div>
 				)}
 			</div>
 		</div>