Sync URL parameters with elo form for sharing of url

This commit is contained in:
Timothy Armes
2023-09-25 17:28:54 +02:00
parent 14b723c799
commit 57eab6986d
3 changed files with 153 additions and 80 deletions
+6 -2
View File
@@ -111,6 +111,7 @@ export const TournamentResults = ({
</div>
<table className="mt-8 w-full">
<tbody>
{deltas.map((delta, i) => {
const { estimated, national, lostByForfeit, wonByForfeit } = delta;
const opponentElo = delta.opponentElo
@@ -133,7 +134,9 @@ export const TournamentResults = ({
const playedWhite = delta.colour === "white";
const whitePlayer = playedWhite ? playerResults.name : opponentName;
const blackPlayer = !playedWhite ? playerResults.name : opponentName;
const blackPlayer = !playedWhite
? playerResults.name
: opponentName;
const noChange =
wonByForfeit || lostByForfeit || estimated || national;
@@ -154,7 +157,7 @@ export const TournamentResults = ({
} else result = t("blackWin");
return (
<tr className="text-gray-900 dark:text-neutral-400">
<tr key={i} className="text-gray-900 dark:text-neutral-400">
{forfeit ? (
<td className="pb-2">{t("forfeit")}</td>
) : (
@@ -185,6 +188,7 @@ export const TournamentResults = ({
</tr>
);
})}
</tbody>
</table>
{noChangeCount > 0 && (
+84 -14
View File
@@ -1,11 +1,12 @@
"use client";
import { useState } from "react";
import { useEffect, useRef, useState } from "react";
import { zodResolver } from "@hookform/resolvers/zod";
import { isEmpty, sortBy } from "lodash";
import { useTranslations } from "next-intl";
import Link from "next/link";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { FormProvider, useForm } from "react-hook-form";
import { z } from "zod";
@@ -19,9 +20,11 @@ import { KFactor } from "./KFactor";
import { ManualEloForm } from "./ManualEloForm";
import { TournamentResults } from "./TournamentResults";
const kFactors = ["40", "20", "10"];
const formSchema = fetchTournamentResultsSchema.extend({
player: z.string().optional(),
kFactor: z.enum(["40", "30", "20", "15", "10"]),
kFactor: z.string(),
});
type FetchResultsFormValues = z.infer<typeof formSchema>;
@@ -30,12 +33,19 @@ export default function Elo() {
const t = useTranslations("Elo");
type TranslationKey = Parameters<typeof t>[0];
const [formInput, setFormInput] = useState<FetchResultsFormValues>({
url: "",
kFactor: "20",
});
const router = useRouter();
const pathname = usePathname();
const searchParams = useSearchParams();
const current = new URLSearchParams(Array.from(searchParams.entries()));
const hasUrl = !isEmpty(formInput?.url.trim());
const url = searchParams.get("url") ?? "";
const kFactorParam = searchParams.get("k");
const player = searchParams.get("player") ?? "";
const kFactor =
kFactorParam && kFactors.includes(kFactorParam) ? kFactorParam : "20";
const hasUrl = !isEmpty(url.trim());
const {
data: allResults,
@@ -43,7 +53,7 @@ export default function Elo() {
error,
} = trpc.fetchTournamentResults.useQuery(
{
url: formInput?.url.trim(),
url: url?.trim(),
},
{
refetchOnWindowFocus: false,
@@ -65,26 +75,86 @@ export default function Elo() {
const form = useForm<FetchResultsFormValues>({
resolver: zodResolver(fetchTournamentResultsSchema),
defaultValues: {
kFactor: "20",
url: url ?? "",
kFactor: kFactor ?? "20",
player: player ?? "",
},
});
const [player, kFactor] = form.watch(["player", "kFactor"]);
const playerResults = allResults?.find((p) => p.id === player);
const onSubmit = async (input: FetchResultsFormValues) => {
setFormInput(input);
current.set("url", input.url);
if (input.kFactor) current.set("k", input.kFactor);
const search = current.toString();
const query = search ? `?${search}` : "";
// Push the new URL
router.push(`${pathname}${query}`);
};
const clearForm = () => {
current.delete("url");
current.delete("k");
current.delete("player");
form.setValue("url", "");
setFormInput({ ...formInput, url: "" });
form.setValue("kFactor", "20");
form.setValue("player", "");
const search = current.toString();
const query = search ? `?${search}` : "";
router.push(`${pathname}${query}`);
};
useEffect(() => {
// We subscribe to form changes and update the URL parameters
const subscription = form.watch((value, { name, type }) => {
let update = false;
if (type === "change") {
if (name === "player" && value.player !== player && value.player) {
current.set("player", value.player);
update = true;
} else if (
name === "kFactor" &&
value.kFactor !== kFactor &&
value.kFactor
) {
current.set("k", value.kFactor);
update = true;
}
if (update) {
const search = current.toString();
const query = search ? `?${search}` : "";
router.replace(`${pathname}${query}`);
}
}
});
return () => subscription.unsubscribe();
}, [form.watch, kFactor, player]);
useEffect(() => {
// When the URL changes, we update the form values
if (url !== form.getValues("url")) {
form.setValue("url", url);
}
if (player !== form.getValues("player")) {
form.setValue("player", player);
}
if (kFactor !== form.getValues("kFactor")) {
form.setValue("kFactor", form.getValues("kFactor"));
}
}, [searchParams, form]);
if (error) {
console.error(error);
}
const playerResults = allResults?.find((p) => p.id === player);
return (
<section className="grid place-items-center bg-white pb-20 dark:bg-gray-800">
<div className="max-w-xl px-4 py-8 lg:py-16">
@@ -114,7 +114,6 @@ export const fetchTournamentResults = publicProcedure
const tournamentId =
input.url.match(/Ref=(\d+)/)?.[1] ?? input.url.match(/Id\/(\d+)/)?.[1];
if (!tournamentId) {
throw new Error("ERR_NO_TOURNAMENT_ID");
}