Merge branch 'main' of https://github.com/CodeChefVIT/devsoc-admin-25

Author: Abh1noob

src/api/teams.ts

@@ -38,9 +38,9 @@ export const fetchTeams = async ({
   }
 };
 
-export const setTeamRound = async (id: string, round: string) => {
+export const setTeamRound = async (id: string, round: number) => {
   try{
-    const response = await axios.put<TeamsResponse>("/admin/team/rounds",{id, role: round});
+    const response = await axios.put<TeamsResponse>("/admin/team/rounds",{id, round_qualified: round});
     return response.data
   }
   catch(err){

src/components/changeRound.tsx

@@ -9,23 +9,20 @@ import {
   SelectLabel,
 } from "@/components/ui/select";
 import { type Row } from "@tanstack/react-table"; // Adjust the import based on your setup
-import { useEffect, useState } from "react";
-import toast from "react-hot-toast";
-import { Leaderboard } from "@/api/leaderboard";
+import { useState } from "react";
+import { type Leaderboard } from "@/api/leaderboard";
 import { setTeamRound } from "@/api/teams";
 
-interface SelectCellProps {
-  row: Row<Leaderboard>;
-}
 
-function ChangeRound({ row }: SelectCellProps) {
+
+function ChangeRound({ id }: {id:string}) {
   const queryClient = useQueryClient();
 
   const [selectedValue, setSelectedValue] = useState<string>("");
 
   const mutation = useMutation({
     mutationFn: (data: { id: string; round: string }) => {
-      return setTeamRound(data.id, data.round);
+      return setTeamRound(data.id, Number(data.round));
     },
     onSuccess: async () => {
       await queryClient.invalidateQueries({
@@ -35,12 +32,12 @@ function ChangeRound({ row }: SelectCellProps) {
   });
   //So, even if mutation.mutate fails its gonna set to new value. Fix should be ez
   const handleValueChange = (round: string) => {
-    mutation.mutate({ id: row.original.team_id, round: round });
+    mutation.mutate({ id: id, round: round });
     setSelectedValue(round); // Update local state immediately
   };
 
   return (
-    <div className="w-full">
+    <div className="flex items-center justify-center">
       <Select
         value={selectedValue}
         disabled={mutation.isPending}

src/components/columns/LeaderBoardCol.tsx

@@ -24,8 +24,8 @@ const columns: ColumnDef<z.infer<typeof leaderboardUserSchema>>[] = [
   },
   {
     accessorKey: "ID",
-    header: "Set Round",
-    cell: ({ row }) => <ChangeRound row={row} />,
+    header: "Change Round",
+    cell: ({ row }) => <ChangeRound id={row.original.team_id} />,
   },
   {
     accessorKey: "View",

src/components/columns/TeamCol.tsx

@@ -8,6 +8,7 @@ import { type Team } from "@/data/schema";
 import { Button } from "@/components/ui/button";
 import { useRouter } from "next/navigation";
 import { ArrowRight } from "lucide-react";
+import ChangeRound from "../changeRound";
 
 const TeamActions = ({ teamId }: { teamId: string | null }) => {
   const router = useRouter();
@@ -62,6 +63,11 @@ const columns: ColumnDef<Team>[] = [
       return <TeamActions teamId={row.original.ID} />;
     },
   },
+  {
+    accessorKey: "ID",
+    header: "Change Round",
+    cell: ({ row }) => <ChangeRound id={row.original.ID} />,
+  },
 ];
 
 export default columns;

src/data/schema.ts

@@ -46,7 +46,7 @@ export const usersResponseSchema = z.object({
 
 
 export const teamSchema = z.object({
-  ID: z.string().nullable(),
+  ID: z.string(),
   Name: z.string().nullable(),
   NumberOfPeople: z.number(),
   RoundQualified: z.number(),