Merge pull request #11 from acm-cmu/meng/misc

Display map column in Match History
acm-cmu · Jan 27, 2024 · b22b665 · b22b665
2 parents c930ba3 + 1feadfe
commit b22b665
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/components/MatchTable.tsx b/src/components/MatchTable.tsx
@@ -18,33 +18,39 @@ const MatchTable = (props: { data: Match[] }) => {
         accessorKey: 'id',
         header: 'ID',
         filterVariant: 'autocomplete',
-        size: 100,
+        size: 80,
       },
       {
         accessorKey: 'player1',
         header: 'Team 1',
         filterVariant: 'autocomplete',
         size: 200,
-        maxSize: 250,
+        maxSize: 140,
       },
       {
         accessorKey: 'player2',
         header: 'Team 2',
         filterVariant: 'autocomplete',
         size: 200,
-        maxSize: 250,
+        maxSize: 140,
       },
       {
         accessorKey: 'category',
         header: 'Category',
         filterVariant: 'select',
         size: 150,
       },
+      {
+        accessorKey: 'map',
+        header: 'Map',
+        filterVariant: 'multi-select',
+        size: 150,
+      },
       {
         accessorKey: 'status',
         header: 'Status',
         filterVariant: 'select',
-        size: 150,
+        size: 130,
       },
       {
         accessorKey: 'outcome',
@@ -57,7 +63,7 @@ const MatchTable = (props: { data: Match[] }) => {
         header: 'Replay',
         Cell: ReplayCell,
         filterVariant: 'select',
-        size: 140,
+        size: 130,
       },
     ],
     [],

diff --git a/src/pages/api/admin/admin-match-history.ts b/src/pages/api/admin/admin-match-history.ts
@@ -31,6 +31,7 @@ export interface Match {
   player1: string;
   player2: string;
   category: string;
+  map: string;
   status: string;
   outcome: string;
   replay: string;
@@ -77,6 +78,7 @@ export default async function handler(
             ? item.players.L[1].M.teamName.S
             : 'unknown',
         category: item.category ? item.category.S : 'unknown',
+        map: item.map && item.map.S ? item.map.S : 'unknown',
         status: item.item_status ? item.item_status.S : 'unknown',
         outcome: item.placement ? item.placement.N?.toString() : '-1',
         replay:

diff --git a/src/pages/api/user/match-history.ts b/src/pages/api/user/match-history.ts
@@ -25,10 +25,11 @@ const client = DynamoDBDocument.from(new DynamoDB(config), {
   },
 });
 
-interface Match {
+export interface Match {
   id: string;
   player: string;
   opponent: string;
+  map: string;
   outcome: string;
   type: string;
   replay: string | null;
@@ -87,6 +88,7 @@ export default async function handler(
         opponent: item.players.L[0].M.current.B
           ? item.players.L[1].M.teamName.S
           : item.players.L[0].M.teamName.S,
+        map: item.map ? item.map.S : 'Unknown',
         outcome: item.placement ? item.placement.N.toString() : 'PENDING',
         type: item.category.S,
         replay: item.s3_key

diff --git a/src/pages/user/scrimmages.tsx b/src/pages/user/scrimmages.tsx
@@ -10,6 +10,7 @@ import { useSession } from 'next-auth/react';
 import useSWR from 'swr';
 import { useState } from 'react';
 import { Card, Table, Button } from 'react-bootstrap';
+import { Match } from '@pages/api/user/match-history';
 
 import {
   DynamoDB,
@@ -48,16 +49,6 @@ const client = DynamoDBDocument.from(new DynamoDB(config), {
   },
 });
 
-interface Match {
-  id: string;
-  player: string;
-  opponent: string;
-  outcome: string;
-  type: string;
-  replay: string;
-  status: string;
-}
-
 interface Team {
   name: string;
   rating: number;
@@ -85,6 +76,7 @@ const TableRow: React.FC<{ match: Match }> = ({ match }) => {
     <tr style={{ backgroundColor }}>
       <td>{match.id}</td>
       <td>{match.opponent}</td>
+      <td>{match.map}</td>
       <td>{match.status}</td>
       <td>{match.outcome}</td>
       <td>{match.type}</td>
@@ -234,6 +226,7 @@ const ScrimmagesTable: React.FC<{ data: Match[] }> = ({ data }) => (
       <tr>
         <th>Match ID</th>
         <th>Opponent</th>
+        <th>Map</th>
         <th>Status</th>
         <th>Outcome</th>
         <th>Type</th>