Admin fixes

prisma/db.ts

@@ -18,7 +18,7 @@ const connectionString = config.DATABASE_URL;
 
 const pool = new Pool({ connectionString });
 const adapter = new PrismaNeon(pool);
-const prisma = global.prisma || new PrismaClient({ adapter });
+const prisma = global.prisma || new PrismaClient({ adapter, log: ["query"] });
 
 if (process.env.NODE_ENV === "development") global.prisma = prisma;
 

prisma/lib/admin.ts

@@ -1,7 +1,11 @@
+import { unstable_cache } from "next/cache";
 import prisma from "../db";
-// Should only do this once in the EntryCreator I think
-export const getRDCMembers = async () => {
-  const members = await prisma.player.findMany();
 
-  return members;
-};
+export const getAllSessions = unstable_cache(
+  async () =>
+    await prisma.videoSession.findMany({
+      include: { Game: { select: { gameName: true } } },
+    }),
+  undefined,
+  { revalidate: 604800, tags: ["getAllSessions"] }, // 1 week
+);

prisma/lib/games.ts

@@ -1,3 +1,5 @@
+"use server";
+
 import { unstable_cache } from "next/cache";
 import prisma from "../db";
 import { StatName } from "@prisma/client";
@@ -10,12 +12,15 @@ import { getSumOfStat } from "@prisma/client/sql";
  * Fetches all games from the database.
  * @returns all game records including gameName and gameId
  */
-export const getAllGames = function () {
-  return unstable_cache(async () => await prisma.game.findMany(), undefined, {
+export const getAllGames = unstable_cache(
+  async () => await prisma.game.findMany(),
+  undefined,
+  {
     tags: ["getAllGames"],
     revalidate: false,
-  })();
-};
+  },
+);
+
 export const getSumPerStat = async (playerId: number, statName: StatName) =>
   await prisma.$queryRawTyped(getSumOfStat(playerId, statName));
 /**

src/app/(routes)/(groups)/games/[slug]/page.tsx

@@ -12,7 +12,7 @@ import GolfWithFriends from "./_components/golfwithfriends";
 // ? Force non specified routes to return 404
 export const dynamicParams = false; // true | false,
 
-// TODO May need to revalidathPath/Tag after updating data.
+// TODO May need to revalidatePath/Tag after updating data.
 
 export async function generateStaticParams() {
   const games = await getAllGames();
@@ -66,6 +66,10 @@ export default async function Page({
   );
 }
 
+const Sessions = () => {
+  // TODO This will be a table with all of the currently submitted sessions for a game. Show the name. url, and thumbnail.
+};
+
 // const Average = ({
 // }: {
 // }) => {

src/app/(routes)/(groups)/members/[slug]/page.tsx

@@ -45,7 +45,7 @@ export default async function Page({
           <CardTitle>Chart</CardTitle>
         </CardHeader>
       </Card>
-      <div className="mt-10 flex gap-10">
+      <div className="mt-10 flex flex-wrap gap-10">
         <Card className="h-64 flex-1">
           <CardHeader>
             <CardTitle>Chart</CardTitle>

src/app/(routes)/admin/_components/EntryCreatorForm.tsx

@@ -4,7 +4,10 @@ import { useForm, FormProvider } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Player } from "@prisma/client";
 import SetManager from "./SetManager";
-import { insertNewSessionFromAdmin } from "@/app/actions/adminAction";
+import {
+  insertNewSessionFromAdmin,
+  insertNewSessionV2,
+} from "@/app/actions/adminAction";
 import { Form } from "@/components/ui/form";
 import { Button } from "@/components/ui/button";
 import { toast } from "sonner";
@@ -13,6 +16,9 @@ import { AdminFormProps } from "../_utils/form-helpers";
 import { useAdmin } from "@/lib/adminContext";
 import { useFormStatus } from "react-dom";
 import { SessionInfo } from "./SessionInfo";
+import { errorCodes } from "@/lib/constants";
+import { signOut } from "@/auth";
+import { revalidateTag } from "next/cache";
 
 interface Props {
   rdcMembers: Player[];
@@ -67,17 +73,22 @@ const EntryCreatorForm = (props: AdminFormProps) => {
       data,
       stringified: JSON.stringify(data, null, 2),
     });
+    console.time();
+    const { error: err } = await insertNewSessionFromAdmin(data);
+    // const { error: err } = await insertNewSessionV2(data);
+    console.timeEnd();
+    console.log(err);
 
-    // data.date = new Date(data.date);
-    // console.log("Date Type in submit:", typeof data.date);
-    const err = await insertNewSessionFromAdmin(data);
-    if (err === null)
-      toast.error("Video already submitted", { richColors: true });
-    else toast.success("Session successfully created.", { richColors: true });
+    if (err)
+      err === errorCodes.NotAuthenticated
+        ? await signOut({ redirectTo: "/" })
+        : toast.error(err, { richColors: true });
+    else {
+      toast.success("Session successfully created.", { richColors: true });
+      revalidateTag("getAllSessions");
+    }
   };
 
-  // console.log("Date Type:", typeof getValues().date);
-
   /**
    * Handles errors that occur during form submission.
    *

src/app/(routes)/admin/_components/GameDropDownForm.tsx

@@ -1,6 +1,10 @@
 "use client";
 import { Check, ChevronsUpDown } from "lucide-react";
-import { Control, ControllerRenderProps } from "react-hook-form";
+import {
+  Control,
+  ControllerRenderProps,
+  UseFormResetField,
+} from "react-hook-form";
 
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
@@ -24,24 +28,24 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import { getGames } from "@/app/actions/adminAction";
 import { Game } from "@prisma/client";
 import { useState, useEffect } from "react";
 import { FormValues } from "../_utils/form-helpers";
+import { getAllGames } from "../../../../../prisma/lib/games";
 
 const GameDropDownForm = ({
   control,
+  reset,
 }: {
   control: Control<FormValues>;
   field: ControllerRenderProps<FormValues>;
+  reset: UseFormResetField<FormValues>;
 }) => {
   const [testGames, setTestGames] = useState<Game[]>([]);
 
   useEffect(() => {
     const fetchGames = async () => {
-      // TODO I'm so confused how this is working lol we shouldn't be able to access prisma on the client.
-      // This should be fetched on the server and then passed down as a prop.
-      const games = await getGames();
+      const games = await getAllGames();
       setTestGames(games);
     };
     fetchGames();
@@ -53,7 +57,7 @@ const GameDropDownForm = ({
       name="game"
       render={({ field }) => (
         <FormItem className="flex flex-col">
-          <FormLabel>Game</FormLabel>
+          <FormLabel className="w-fit">Game</FormLabel>
           <Popover>
             <PopoverTrigger asChild>
               <FormControl>
@@ -88,6 +92,7 @@ const GameDropDownForm = ({
                         key={game.gameId}
                         onSelect={() => {
                           field.onChange(game.gameName);
+                          reset("sets");
                         }}
                       >
                         {game.gameName}

src/app/(routes)/admin/_components/MatchManager.tsx

@@ -22,7 +22,7 @@ const MatchManager = (props: Props) => {
   });
   const players = getValues(`players`);
 
-  const statName = "MK8_POS";
+  const statName = "MK8_POS"; // ! TODO Can we remove this
 
   /**
    *  Handles create new match button click.

src/app/(routes)/admin/_components/PlayerStatManager.tsx

@@ -6,8 +6,8 @@ import { v4 as uuidv4 } from "uuid";
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useAdmin } from "@/lib/adminContext";
-import { StatNames } from "../../../../../prisma/lib/utils";
 import { FormValues } from "../_utils/form-helpers";
+import { StatNames } from "../../../../../prisma/lib/utils";
 
 interface Props {
   player: Player;
@@ -33,56 +33,74 @@ const PlayerStatManager = (props: Props) => {
     control,
   });
 
-  const [loading, setLoading] = useState(true);
+  // const [loading, setLoading] = useState(true);
   const { gameStats } = useAdmin();
 
   // TODO: Move to PlayerSessionManager or above
+
   useEffect(() => {
-    console.log(
-      "All Player Sessions: ",
-      getValues(`sets.${setIndex}.matches.${matchIndex}.playerSessions`),
+    let ignore = false;
+    const matchFields = getValues(
+      `sets.${setIndex}.matches.${matchIndex}.playerSessions.${playerSessionIndex}.playerStats`,
     );
+    gameStats.forEach((stat) => {
+      const isMatch = matchFields.some((f) => f.stat === stat.statName); // Need to do this in dev because useEffect renders twice.
+      if (!ignore && !isMatch)
+        append({ statId: uuidv4(), stat: stat.statName, statValue: "" });
+    });
 
-    // Returns all the playerStats for the match
-    const getPlayerSessionStats = () => {
-      const values = getValues();
-      console.log(" Get PlayerSessionStats Values: ", values);
-      const playerSession =
-        values.sets[setIndex].matches[matchIndex].playerSessions[
-          playerSessionIndex
-        ];
-      console.log("PlayerSessionStatGet: ", playerSession.playerStats);
-      return playerSession.playerStats;
+    return () => {
+      ignore = true;
     };
+  }, [gameStats, append]);
+  // useEffect(() => {
+  //   console.log(
+  //     "All Player Sessions: ",
+  //     getValues(`sets.${setIndex}.matches.${matchIndex}.playerSessions`),
+  //   );
 
-    const fetchGameStats = async () => {
-      const existingStats = getPlayerSessionStats();
-      gameStats.forEach((stat) => {
-        const statExists = existingStats.some(
-          (existingStat) => existingStat.stat === stat.statName,
-        );
-        // Ducttape fix to stop useEffect double render from
-        // doubling playerStat fields
-        if (!statExists && stat.statName !== StatNames.RLDay) {
-          append({ statId: uuidv4(), stat: stat.statName, statValue: "" });
-        }
-      });
-      setLoading(false);
-    };
-    fetchGameStats();
-  }, [append, getValues, matchIndex, playerSessionIndex, setIndex, gameStats]);
+  //   // Returns all the playerStats for the match
+  //   const getPlayerSessionStats = () => {
+  //     const values = getValues();
+  //     console.log(" Get PlayerSessionStats Values: ", values);
+  //     const playerSession =
+  //       values.sets[setIndex].matches[matchIndex].playerSessions[
+  //         playerSessionIndex
+  //       ];
+  //     console.log("PlayerSessionStatGet: ", playerSession.playerStats);
+  //     return playerSession.playerStats;
+  //   };
+
+  //   const fetchGameStats = async () => {
+  //     console.log("Fetching game stats");
+  //     const existingStats = getPlayerSessionStats();
+  //     gameStats.forEach((stat) => {
+  //       const statExists = existingStats.some(
+  //         (existingStat) => existingStat.stat === stat.statName,
+  //       );
+  //       // Ducttape fix to stop useEffect double render from
+  //       // doubling playerStat fields
+  //       if (!statExists) {
+  //         append({ statId: uuidv4(), stat: stat.statName, statValue: "" });
+  //       }
+  //     });
+  //     setLoading(false);
+  //   };
+  //   fetchGameStats();
+  // }, [append, getValues, matchIndex, playerSessionIndex, setIndex, gameStats]);
 
-  console.log("PlayerStatManagerFields: ", fields);
-  console.log("Loading: ", loading);
+  // console.log("PlayerStatManagerFields: ", fields);
+  // console.log("Loading: ", loading);
 
   // TODO Fix bug, when changing the games doesn't remove stale inputs
   return (
     <>
       {fields.map((field, index: number) => {
         return (
           <div key={field.id} className="my-4 flex gap-3">
+            <span className="sr-only">{field.stat}</span>
             <Input
-              className="h-full max-w-xs"
+              className="max-w-xs"
               placeholder={field.stat}
               type="text"
               {...register(