From 2a3b99830266be77e8f244fa7f5526e2ae6260a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <maximilian.ruesch@stud.tu-darmstadt.de>
Date: Thu, 28 Dec 2023 22:20:54 +0100
Subject: [PATCH] Fix epic editing problems

---
 electron/providers/jira-cloud-provider/JiraCloudProvider.ts | 2 +-
 .../providers/jira-server-provider/JiraServerProvider.ts    | 2 +-
 .../DetailView/Components/EditableEpic/EditableEpic.tsx     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/electron/providers/jira-cloud-provider/JiraCloudProvider.ts b/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
index 6f0fb559..9e376432 100644
--- a/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
+++ b/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
@@ -769,7 +769,7 @@ export class JiraCloudProvider implements IProvider {
               ...(summary && {
                 summary,
               }),
-              ...(epic && epic.issueKey && {
+              ...(epic && epic.issueKey !== undefined && {
                 parent: { key: epic.issueKey },
               }),
               ...(type && {
diff --git a/electron/providers/jira-server-provider/JiraServerProvider.ts b/electron/providers/jira-server-provider/JiraServerProvider.ts
index 29a71261..46c7a56a 100644
--- a/electron/providers/jira-server-provider/JiraServerProvider.ts
+++ b/electron/providers/jira-server-provider/JiraServerProvider.ts
@@ -875,7 +875,7 @@ export class JiraServerProvider implements IProvider {
               ...(summary && {
                 summary,
               }),
-              ...(epic && epic.issueKey && {
+              ...(epic && epic.issueKey !== undefined && {
                 parent: { key: epic.issueKey },
               }),
               ...(type && {
diff --git a/src/components/DetailView/Components/EditableEpic/EditableEpic.tsx b/src/components/DetailView/Components/EditableEpic/EditableEpic.tsx
index af5e6ff1..1a8f507d 100644
--- a/src/components/DetailView/Components/EditableEpic/EditableEpic.tsx
+++ b/src/components/DetailView/Components/EditableEpic/EditableEpic.tsx
@@ -28,7 +28,7 @@ export function EditableEpic({
   })
   const [selectedEpic, setSelectedEpic] = useState(epic.issueKey)
   const mutationEpic = useMutation({
-    mutationFn: (epicKey: string) => editIssue({ epic: { issueKey: epicKey } } as Issue, issueKey),
+    mutationFn: (epicKey: string | null) => editIssue({ epic: { issueKey: epicKey } } as Issue, issueKey),
     onError: () => {
       showNotification({
         message: `An error occurred while modifing the Epic 😢`,
@@ -64,8 +64,8 @@ export function EditableEpic({
             ItemComponent={SelectItem}
             value={selectedEpic}
             onChange={(value) => {
-              setSelectedEpic(value!)
-              mutationEpic.mutate(value!)
+              setSelectedEpic(value)
+              mutationEpic.mutate(value ?? null)
               setShowEpicInput(false)
             }}
           />