From dd2318f499ac4a3c80bdfc05509977bd6f7127bb Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Tue, 25 Apr 2023 00:13:04 +0300
Subject: [PATCH] Fix to tools mode not being preselected when editing calendar
 event

---
 app/db/models/calendar/findById.sql      | 1 +
 app/db/models/calendar/queries.server.ts | 1 +
 app/routes/calendar/new.tsx              | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/db/models/calendar/findById.sql b/app/db/models/calendar/findById.sql
index 0cf0db06d..66eaf61dc 100644
--- a/app/db/models/calendar/findById.sql
+++ b/app/db/models/calendar/findById.sql
@@ -7,6 +7,7 @@ select
   "CalendarEvent"."tags",
   "CalendarEvent"."participantCount",
   "CalendarEvent"."toToolsEnabled",
+  "CalendarEvent"."toToolsMode",
   "User"."id" as "authorId",
   exists (
     select
diff --git a/app/db/models/calendar/queries.server.ts b/app/db/models/calendar/queries.server.ts
index c9b5bf55b..cf8d69455 100644
--- a/app/db/models/calendar/queries.server.ts
+++ b/app/db/models/calendar/queries.server.ts
@@ -355,6 +355,7 @@ export function findById(id: CalendarEvent["id"]) {
       | "authorId"
       | "participantCount"
       | "toToolsEnabled"
+      | "toToolsMode"
     > &
       Pick<CalendarEventDate, "startTime" | "eventId"> &
       Pick<
diff --git a/app/routes/calendar/new.tsx b/app/routes/calendar/new.tsx
index 8b3aeff97..c50c6821e 100644
--- a/app/routes/calendar/new.tsx
+++ b/app/routes/calendar/new.tsx
@@ -599,7 +599,9 @@ function TOToolsAndMapPool() {
   const [checked, setChecked] = React.useState(
     Boolean(eventToEdit?.toToolsEnabled)
   );
-  const [mode, setMode] = React.useState<"ALL" | RankedModeShort>("ALL");
+  const [mode, setMode] = React.useState<"ALL" | RankedModeShort>(
+    eventToEdit?.toToolsMode ?? "ALL"
+  );
 
   return (
     <>
@@ -612,6 +614,7 @@ function TOToolsAndMapPool() {
             className="calendar-new__select"
             onChange={(e) => setMode(e.target.value as RankedModeShort)}
             name="toToolsMode"
+            defaultValue={mode}
           >
             <option value="ALL">All modes</option>
             <option value="SZ">SZ only</option>