From 80f8b56aa56278940f83b8a0b7c8aaf9a0909756 Mon Sep 17 00:00:00 2001
From: zilmosat <101370810+zilmosat@users.noreply.github.com>
Date: Sat, 17 Jun 2023 15:02:34 +0200
Subject: [PATCH 1/3] Add endRecur to dialog when editing note. Fixes #162

---
 src/ui/components/EditEvent.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ui/components/EditEvent.tsx b/src/ui/components/EditEvent.tsx
index 773a243..f40b418 100644
--- a/src/ui/components/EditEvent.tsx
+++ b/src/ui/components/EditEvent.tsx
@@ -128,7 +128,11 @@ export const EditEvent = ({
     const [isRecurring, setIsRecurring] = useState(
         initialEvent?.type === "recurring" || false
     );
-    const [endRecur, setEndRecur] = useState("");
+    const [endRecur, setEndRecur] = useState(
+		initialEvent && initialEvent.type === "recurring"
+			? initialEvent.endRecur
+			: ""
+	);
 
     const [daysOfWeek, setDaysOfWeek] = useState<string[]>(
         (initialEvent?.type === "recurring" ? initialEvent.daysOfWeek : []) ||

From 4d371182f75b3c93e0e3c74af7f096ff0da10c7d Mon Sep 17 00:00:00 2001
From: zilmosat <101370810+zilmosat@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:31:29 +0100
Subject: [PATCH 2/3] Merge endRecur to endDate field as startDate is in date.

---
 src/ui/components/EditEvent.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/ui/components/EditEvent.tsx b/src/ui/components/EditEvent.tsx
index f40b418..4e113eb 100644
--- a/src/ui/components/EditEvent.tsx
+++ b/src/ui/components/EditEvent.tsx
@@ -108,9 +108,15 @@ export const EditEvent = ({
             : ""
     );
     const [endDate, setEndDate] = useState(
-        initialEvent && initialEvent.type === "single"
-            ? initialEvent.endDate
-            : undefined
+        initialEvent
+            ? initialEvent.type === "single"
+                ? initialEvent.endDate || undefined
+                : initialEvent.type === "recurring"
+                ? initialEvent.endRecur
+                : initialEvent.type === "rrule"
+                ? initialEvent.startDate || undefined
+                : ""
+            : ""
     );
 
     let initialStartTime = "";
@@ -128,11 +134,6 @@ export const EditEvent = ({
     const [isRecurring, setIsRecurring] = useState(
         initialEvent?.type === "recurring" || false
     );
-    const [endRecur, setEndRecur] = useState(
-		initialEvent && initialEvent.type === "recurring"
-			? initialEvent.endRecur
-			: ""
-	);
 
     const [daysOfWeek, setDaysOfWeek] = useState<string[]>(
         (initialEvent?.type === "recurring" ? initialEvent.daysOfWeek : []) ||
@@ -185,7 +186,7 @@ export const EditEvent = ({
                               | "S"
                           )[],
                           startRecur: date || undefined,
-                          endRecur: endRecur || undefined,
+                          endRecur: endDate || undefined,
                       }
                     : {
                           type: "single",
@@ -330,9 +331,10 @@ export const EditEvent = ({
                             <input
                                 type="date"
                                 id="endDate"
-                                value={endRecur}
+                                value={endDate}
                                 onChange={makeChangeListener(
-                                    setEndRecur,
+                                    // @ts-ignore
+                                    setEndDate,
                                     (x) => x
                                 )}
                             />

From 9d35a192ef7366488ba3dbfc9c0398096dab841b Mon Sep 17 00:00:00 2001
From: zilmosat <101370810+zilmosat@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:45:47 +0100
Subject: [PATCH 3/3] Change undefined to empty to make input field controlled

---
 src/ui/components/EditEvent.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/components/EditEvent.tsx b/src/ui/components/EditEvent.tsx
index 4e113eb..43d954d 100644
--- a/src/ui/components/EditEvent.tsx
+++ b/src/ui/components/EditEvent.tsx
@@ -110,11 +110,11 @@ export const EditEvent = ({
     const [endDate, setEndDate] = useState(
         initialEvent
             ? initialEvent.type === "single"
-                ? initialEvent.endDate || undefined
+                ? initialEvent.endDate || ""
                 : initialEvent.type === "recurring"
                 ? initialEvent.endRecur
                 : initialEvent.type === "rrule"
-                ? initialEvent.startDate || undefined
+                ? initialEvent.startDate || ""
                 : ""
             : ""
     );