Use full names of variants in lists where possible

AbstractPlay · Sep 22, 2024 · 44a98ed · 44a98ed
1 parent 2cff62a
commit 44a98ed
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 12 deletions.
diff --git a/src/components/ListGames.js b/src/components/ListGames.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useMemo } from "react";
 import { Link, useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { gameinfo } from "@abstractplay/gameslib";
+import { gameinfo, GameFactory } from "@abstractplay/gameslib";
 import { API_ENDPOINT_OPEN } from "../config";
 import {
   getCoreRowModel,
@@ -58,6 +58,16 @@ function ListGames({ fixedState }) {
   }, [gameState, metaGame, fixedState]);
 
   const metaGameName = gameinfo.get(metaGame).name;
+  const variantMap = useMemo(() => {
+    const info = gameinfo.get(metaGame);
+    let gameEngine;
+    if (info.playercounts.length > 1) {
+      gameEngine = GameFactory(info.uid, 2);
+    } else {
+      gameEngine = GameFactory(info.uid);
+    }
+    return new Map(gameEngine.allvariants().map(rec => [rec.uid, rec.name]));
+  }, [metaGame]);
 
   const data = useMemo(
     () =>
@@ -79,11 +89,11 @@ function ListGames({ fixedState }) {
               ? rec.winner.map((w) => rec.players[w - 1].name)
               : null,
           variants:
-            "variants" in rec && rec.variants !== null ? rec.variants : null,
+            "variants" in rec && rec.variants !== null ? rec.variants.map(id => variantMap.has(id) ? variantMap.get(id) : id) : null,
           cbit: fixedState === "completed" || gameState === "completed" ? 1 : 0,
         };
       }),
-    [games, gameState, fixedState]
+    [games, gameState, fixedState, variantMap]
   );
 
   const columnHelper = createColumnHelper();
@@ -129,7 +139,7 @@ function ListGames({ fixedState }) {
       columnHelper.accessor("variants", {
         header: "Variants",
         cell: (props) =>
-          props.getValue() === null ? "" : props.getValue().join(", "),
+          props.getValue() === null ? "" : props.getValue().join("; "),
       }),
       columnHelper.display({
         id: "actions",

diff --git a/src/components/Me/ChallengeResponseModal.js b/src/components/Me/ChallengeResponseModal.js
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { gameinfo } from "@abstractplay/gameslib";
+import { gameinfo, GameFactory } from "@abstractplay/gameslib";
 import { MeContext } from "../../pages/Skeleton";
 import Modal from "../Modal";
 
@@ -49,7 +49,18 @@ function ChallengeResponseModal(props) {
     var desc = "";
     const numVariants =
       challenge.variants === undefined ? 0 : challenge.variants.length;
-    const variants = numVariants > 0 ? challenge.variants.join(", ") : null;
+    let variantMap = new Map();
+    if (numVariants > 0) {
+        const info = gameinfo.get(challenge.metaGame);
+        let gameEngine;
+        if (info.playercounts.length > 1) {
+          gameEngine = GameFactory(info.uid, 2);
+        } else {
+          gameEngine = GameFactory(info.uid);
+        }
+        variantMap = new Map(gameEngine.allvariants().map(rec => [rec.uid, rec.name]));
+    }
+    const variants = numVariants > 0 ? challenge.variants.map(id => variantMap.has(id) ? variantMap.get(id) : id).join("; ") : null;
     desc =
       t("ChallengeResponseDesc", {
         opp: challenge.challenger.name,

diff --git a/src/components/Me/ChallengeViewModal.js b/src/components/Me/ChallengeViewModal.js
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { gameinfo } from "@abstractplay/gameslib";
+import { gameinfo, GameFactory } from "@abstractplay/gameslib";
 import Modal from "../Modal";
 
 function ChallengeViewModal(props) {
@@ -22,7 +22,18 @@ function ChallengeViewModal(props) {
     const game = gameinfo.get(challenge.metaGame);
     const numVariants =
       challenge.variants === undefined ? 0 : challenge.variants.length;
-    const variants = numVariants > 0 ? challenge.variants.join(", ") : null;
+    let variantMap = new Map();
+    if (numVariants > 0) {
+        const info = gameinfo.get(challenge.metaGame);
+        let gameEngine;
+        if (info.playercounts.length > 1) {
+        gameEngine = GameFactory(info.uid, 2);
+        } else {
+        gameEngine = GameFactory(info.uid);
+        }
+        variantMap = new Map(gameEngine.allvariants().map(rec => [rec.uid, rec.name]));
+    }
+    const variants = numVariants > 0 ? challenge.variants.map(id => variantMap.has(id) ? variantMap.get(id) : id).join("; ") : null;
     var challengeDesc = "";
     var players = "";
     const otherplayers = challenge.players

diff --git a/src/components/StandingChallenges.js b/src/components/StandingChallenges.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { useParams, Link } from "react-router-dom";
-import { gameinfo } from "@abstractplay/gameslib";
+import { gameinfo, GameFactory } from "@abstractplay/gameslib";
 import { API_ENDPOINT_OPEN, API_ENDPOINT_AUTH } from "../config";
 import {
   getCoreRowModel,
@@ -262,6 +262,16 @@ function StandingChallenges(props) {
   const metaGameName = gameinfo.get(metaGame).name;
   console.log(metaGame);
   const showRespond = loggedin && challenges;
+  const variantMap = useMemo(() => {
+    const info = gameinfo.get(metaGame);
+    let gameEngine;
+    if (info.playercounts.length > 1) {
+      gameEngine = GameFactory(info.uid, 2);
+    } else {
+      gameEngine = GameFactory(info.uid);
+    }
+    return new Map(gameEngine.allvariants().map(rec => [rec.uid, rec.name]));
+  }, [metaGame]);
 
   const data = useMemo(
     () =>
@@ -287,11 +297,11 @@ function StandingChallenges(props) {
           players: rec.players.filter((p) => p.id !== rec.challenger?.id),
           rated: rec.rated,
           seating: rec.seating,
-          variants: rec.variants,
+          variants: rec.variants.map(id => variantMap.has(id) ? variantMap.get(id) : id),
           comment: rec.comment,
         };
       }),
-    [challenges, allUsers]
+    [challenges, allUsers, variantMap]
   );
 
   const columnHelper = createColumnHelper();
@@ -338,7 +348,7 @@ function StandingChallenges(props) {
       }),
       columnHelper.accessor("variants", {
         header: "Variants",
-        cell: (props) => props.getValue().join(", "),
+        cell: (props) => props.getValue().join("; "),
       }),
       columnHelper.accessor("comment", {
         header: "Notes",