From f88923851adb992119d097746dd3f523e454ebda Mon Sep 17 00:00:00 2001
From: Timothy Armes <tim@timothyarmes.com>
Date: Wed, 5 Jul 2023 21:52:01 +0200
Subject: [PATCH] Fix translations (#68)

* Feature/clear search (#66)

* clear search

* clear button placement

* smaller button size

* multilingual clear button

* Fix translation (#65)

---------

Co-authored-by: Owen Rees <owenrees82@gmail.com>
---
 app/[lang]/tournois/SearchBar.tsx       | 10 ++++++----
 app/[lang]/tournois/TournamentTable.tsx | 20 ++++++++++++++++++--
 messages/en.json                        |  3 ++-
 messages/fr.json                        |  3 ++-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/[lang]/tournois/SearchBar.tsx b/app/[lang]/tournois/SearchBar.tsx
index 8332ed9..249eb21 100644
--- a/app/[lang]/tournois/SearchBar.tsx
+++ b/app/[lang]/tournois/SearchBar.tsx
@@ -1,11 +1,13 @@
-import { useAtom } from "jotai";
+import { Dispatch, SetStateAction } from "react";
 import { useTranslations } from "next-intl";
 
-import { searchStringAtom } from "@/app/atoms";
+interface SearchBarProps {
+  searchString: string;
+  setSearchString: Dispatch<SetStateAction<string>>;
+}
 
-const SearchBar = () => {
+const SearchBar = ({ searchString, setSearchString }: SearchBarProps) => {
   const t = useTranslations("Tournaments");
-  const [searchString, setSearchString] = useAtom(searchStringAtom);
 
   return (
     <div className="bg-white dark:bg-gray-800">
diff --git a/app/[lang]/tournois/TournamentTable.tsx b/app/[lang]/tournois/TournamentTable.tsx
index afc23bf..044f79c 100644
--- a/app/[lang]/tournois/TournamentTable.tsx
+++ b/app/[lang]/tournois/TournamentTable.tsx
@@ -11,6 +11,7 @@ import {
   hoveredMapTournamentIdAtom,
   debouncedHoveredMapTournamentIdAtom,
   debouncedHoveredListTournamentIdAtom,
+  searchStringAtom,
 } from "@/app/atoms";
 
 import SearchBar from "./SearchBar";
@@ -20,6 +21,7 @@ import ScrollToTopButton from "./ScrollToTopButton";
 export default function TournamentTable() {
   const t = useTranslations("Tournaments");
 
+  const [searchString, setSearchString] = useAtom(searchStringAtom);
   const filteredTournaments = useAtomValue(filteredTournamentsListAtom);
   const [syncVisible, setSyncVisible] = useAtom(syncVisibleAtom);
   const hoveredMapTournamentId = useAtomValue(hoveredMapTournamentIdAtom);
@@ -39,6 +41,10 @@ export default function TournamentTable() {
     tournamentRow?.scrollIntoView({ behavior: "smooth" });
   }, [debouncedHoveredMapTournamentId]);
 
+  const handleClearSearch = () => {
+    setSearchString("");
+  };
+
   return (
     <section
       className="tournament-table grid w-full auto-rows-max pb-20 lg:col-start-2 lg:col-end-3 lg:h-[calc(100vh-144px)] lg:overflow-y-scroll"
@@ -46,7 +52,16 @@ export default function TournamentTable() {
       data-test="tournament-table-div"
     >
       <div className="z-10 flex w-full flex-wrap items-center justify-between gap-3 p-3">
-        <SearchBar />
+        <SearchBar
+          searchString={searchString}
+          setSearchString={setSearchString}
+        />
+        <button
+          className="mr-auto rounded-full bg-teal-600 px-3 py-1 text-white hover:bg-teal-700"
+          onClick={() => handleClearSearch()}
+        >
+          {t("clearButton")}
+        </button>
         <div className="text-gray-900 dark:text-white">
           <label>
             <input
@@ -86,6 +101,7 @@ export default function TournamentTable() {
             </th>
           </tr>
         </thead>
+
         <tbody>
           {filteredTournaments.length === 0 ? (
             <tr className="bg-white text-gray-900 dark:bg-gray-800 dark:text-white">
@@ -123,7 +139,7 @@ export default function TournamentTable() {
                 </td>
                 <td className="p-3">
                   <a href={tournament.url} target="_blank">
-                    {tournament.timeControl}
+                    {t("timeControlEnum", { tc: tournament.timeControl })}
                   </a>
                 </td>
               </tr>
diff --git a/messages/en.json b/messages/en.json
index c1668c0..82b090f 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -35,7 +35,8 @@
     "tournament": "Tournament",
     "timeControl": "Time Control",
     "approx": "Géo-localisation is approximative",
-    "timeControlEnum": "{tc, select, Classic {Classic} Rapid {Rapid} Blitz {Blitz} KO {1h KO} other {{tc}}}"
+    "timeControlEnum": "{tc, select, Classic {Classic} Rapid {Rapid} Blitz {Blitz} KO {1h KO} other {{tc}}}",
+    "clearButton": "Clear"
   },
 
   "About": {
diff --git a/messages/fr.json b/messages/fr.json
index c1398db..e614871 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -35,7 +35,8 @@
     "tournament": "Tournois",
     "timeControl": "Cadence",
     "approx": "Géolocalisation approximative",
-    "timeControlEnum": "{tc, select, Classic {Cadence Lente} Rapid {Rapide} Blitz {Blitz} KO {1h KO} other {{tc}}}"
+    "timeControlEnum": "{tc, select, Classic {Cadence Lente} Rapid {Rapide} Blitz {Blitz} KO {1h KO} other {{tc}}}",
+    "clearButton": "Effacer"
   },
 
   "About": {