From 72732375f08008429e7f43c1418557075825b980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <78490564+maximilianruesch@users.noreply.github.com>
Date: Sun, 3 Dec 2023 15:48:41 +0100
Subject: [PATCH 1/5] Fix hovering and delete button issues in backlog view
 (#78)

---
 .../BacklogView/Issue/DeleteButton.tsx        | 20 +++++++++++++++----
 .../DeleteIssue/DeleteIssueAlert.tsx          |  5 +++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/BacklogView/Issue/DeleteButton.tsx b/src/components/BacklogView/Issue/DeleteButton.tsx
index 63ce6fd6..982070ed 100644
--- a/src/components/BacklogView/Issue/DeleteButton.tsx
+++ b/src/components/BacklogView/Issue/DeleteButton.tsx
@@ -1,6 +1,7 @@
 import { ActionIcon, Transition, Popover, Box } from "@mantine/core"
 import { IconTrash } from "@tabler/icons"
 import { useEffect, useState } from "react"
+import { useHover } from "@mantine/hooks";
 import { DeleteIssueAlert } from "../../DetailView/Components/DeleteIssue/DeleteIssueAlert"
 
 export function DeleteButton({
@@ -11,15 +12,16 @@ export function DeleteButton({
   issueKey: string
 }) {
   const [issuePopoverOpened, setIssuePopoverOpened] = useState(false)
+  const { ref, hovered } = useHover()
 
   useEffect(() => {
-    if (!mounted) {
+    if (!mounted && !hovered) {
       setIssuePopoverOpened(false)
     }
-  }, [mounted])
+  }, [mounted, hovered])
 
   return (
-    <Box sx={{ position: "absolute", bottom: 5, right: 11 }}>
+    <Box ref={ref} sx={{ position: "absolute", bottom: 5, right: 11 }}>
       <Transition
         mounted={mounted}
         transition="fade"
@@ -41,7 +43,10 @@ export function DeleteButton({
                 size="sm"
                 variant="transparent"
                 style={styles}
-                onClick={() => setIssuePopoverOpened(!issuePopoverOpened)}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  setIssuePopoverOpened(!issuePopoverOpened)
+                }}
               >
                 <IconTrash />
               </ActionIcon>
@@ -54,6 +59,13 @@ export function DeleteButton({
                     : theme.white,
               })}
             >
+              <div style={{
+                height: "20px",
+                position: "absolute",
+                width: "inherit",
+                left: "0px",
+                top: "-10px",
+              }} />
               <DeleteIssueAlert
                 issueKey={issueKey}
                 closeModal={() => setIssuePopoverOpened(false)}
diff --git a/src/components/DetailView/Components/DeleteIssue/DeleteIssueAlert.tsx b/src/components/DetailView/Components/DeleteIssue/DeleteIssueAlert.tsx
index 1d614298..c366b340 100644
--- a/src/components/DetailView/Components/DeleteIssue/DeleteIssueAlert.tsx
+++ b/src/components/DetailView/Components/DeleteIssue/DeleteIssueAlert.tsx
@@ -23,9 +23,10 @@ export function DeleteIssueAlert({
         If you delete this issue, all related subtasks will be deleted as well!
       </Alert>
       <Button
-        onClick={() => {
-          closeModal()
+        onClick={(e) => {
+          e.stopPropagation()
           deleteIssue.mutate(issueKey)
+          closeModal()
         }}
       >
         Confirm

From 6d3ee256b05e913f1a7338f92bac3879985d12ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <78490564+maximilianruesch@users.noreply.github.com>
Date: Sun, 3 Dec 2023 15:49:19 +0100
Subject: [PATCH 2/5] Fix moving issues between backlog and sprints (#76)

---
 .../jira-server-provider/JiraServerProvider.ts     | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/electron/providers/jira-server-provider/JiraServerProvider.ts b/electron/providers/jira-server-provider/JiraServerProvider.ts
index 8390acc5..7e3e3058 100644
--- a/electron/providers/jira-server-provider/JiraServerProvider.ts
+++ b/electron/providers/jira-server-provider/JiraServerProvider.ts
@@ -291,24 +291,16 @@ export class JiraServerProvider implements IProvider {
   async moveIssueToSprintAndRank(
     sprint: number,
     issue: string,
-    rankBefore: string,
-    rankAfter: string
   ): Promise<void> {
     return new Promise((resolve, reject) => {
-      const rankCustomField = this.customFields.get("Rank")
       this.getAgileRestApiClient('1.0')
         .post(
           `/sprint/${sprint}/issue`,
-          {
-            rankCustomFieldId: rankCustomField!.match(/_(\d+)/)![1],
-            issues: [issue],
-            ...(rankAfter && { rankAfterIssue: rankAfter }),
-            ...(rankBefore && { rankBeforeIssue: rankBefore }),
-          }
+          { issues: [issue] } // Ranking issues in the sprints is not supported by Jira server
         )
         .then(() => resolve())
         .catch((error) => {
-          reject(new Error(`Error in moving this issue to the Sprint with id ${sprint}: ${error}`))
+          reject(new Error(`Error in moving this issue to the Sprint with id ${sprint}: ${JSON.stringify(error.response.data)}`))
         })
     })
   }
@@ -352,7 +344,7 @@ export class JiraServerProvider implements IProvider {
         .put('/issue/rank', body)
         .then(() => resolve())
         .catch((error) =>
-          reject(new Error(`Error in moving this issue to the Backlog: ${error}`))
+          reject(new Error(`Error in ranking this issue in the Backlog: ${error}`))
         )
     })
   }

From 7f197a501da722a987ba82d0ed3e017e476037d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <78490564+maximilianruesch@users.noreply.github.com>
Date: Sun, 3 Dec 2023 15:49:46 +0100
Subject: [PATCH 3/5] Fix reloading sprints after creating a sprint (#79)

---
 src/components/BacklogView/CreateSprint/CreateSprintModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/BacklogView/CreateSprint/CreateSprintModal.tsx b/src/components/BacklogView/CreateSprint/CreateSprintModal.tsx
index 2abbb737..ad19d40e 100644
--- a/src/components/BacklogView/CreateSprint/CreateSprintModal.tsx
+++ b/src/components/BacklogView/CreateSprint/CreateSprintModal.tsx
@@ -55,6 +55,7 @@ export function CreateSprintModal({
         message: `The sprint has been created!`,
         color: "green",
       })
+      queryClient.invalidateQueries({ queryKey: ["sprints"] })
       queryClient.invalidateQueries({ queryKey: ["issues", "sprints"] })
       setOpened(false)
       form.reset()

From bb7f62ea267a4fe9d264816f9d42c2f615987bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <78490564+maximilianruesch@users.noreply.github.com>
Date: Mon, 4 Dec 2023 23:05:26 +0100
Subject: [PATCH 4/5] Add implementation for getLabels in jira server (#75)

---
 .../jira-server-provider/JiraServerProvider.ts        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/electron/providers/jira-server-provider/JiraServerProvider.ts b/electron/providers/jira-server-provider/JiraServerProvider.ts
index 7e3e3058..ce9e0b88 100644
--- a/electron/providers/jira-server-provider/JiraServerProvider.ts
+++ b/electron/providers/jira-server-provider/JiraServerProvider.ts
@@ -448,7 +448,16 @@ export class JiraServerProvider implements IProvider {
   }
 
   getLabels(): Promise<string[]> {
-    throw new Error("Method not implemented for Jira Server")
+    return new Promise((resolve, reject) => {
+      this.getRestApiClient(2)
+        .get('/jql/autocompletedata/suggestions?fieldName=labels')
+        .then((response: AxiosResponse<{ results: { value: string }[] }>) => {
+          resolve(response.data.results.map((result) => result.value))
+        })
+        .catch((error) =>
+          reject(new Error(`Error in fetching labels: ${JSON.stringify(error)}`))
+        )
+    })
   }
 
   getPriorities(): Promise<Priority[]> {

From 72d9a3526b07c77a0c2daf8064f7f456b2a9de10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=BCsch?=
 <78490564+maximilianruesch@users.noreply.github.com>
Date: Tue, 5 Dec 2023 23:05:26 +0100
Subject: [PATCH 5/5] Implement create issue for jira server (#73)

---
 .../jira-cloud-provider/JiraCloudProvider.ts  |  29 ++++-
 .../jira-cloud-provider/cloud-types.ts        |  12 ++
 .../JiraServerProvider.ts                     | 121 ++++++++++++++++--
 .../jira-server-provider/server-types.ts      |  12 ++
 .../BacklogView/Issue/IssueCard.tsx           |   6 +-
 .../CreateIssue/CreateIssueModal.tsx          |   2 +-
 .../CreateIssue/Fields/AssigneeSelect.tsx     |  10 +-
 .../CreateIssue/Fields/ProjectSelect.tsx      |   9 +-
 .../CreateIssue/Fields/ReporterSelect.tsx     |   8 +-
 .../Components/AssigneeMenu/AssigneeMenu.tsx  |   4 +-
 .../DetailView/Components/ReporterMenu.tsx    |   4 +-
 types/index.ts                                |  38 +++---
 12 files changed, 196 insertions(+), 59 deletions(-)
 create mode 100644 electron/providers/jira-cloud-provider/cloud-types.ts
 create mode 100644 electron/providers/jira-server-provider/server-types.ts

diff --git a/electron/providers/jira-cloud-provider/JiraCloudProvider.ts b/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
index f7ef14a1..6fae6c6f 100644
--- a/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
+++ b/electron/providers/jira-cloud-provider/JiraCloudProvider.ts
@@ -20,6 +20,7 @@ import {
 } from "../../../types/jira"
 import { IProvider } from "../base-provider"
 import { getAccessToken, refreshTokens } from "./getAccessToken"
+import {JiraCloudUser} from "./cloud-types";
 
 export class JiraCloudProvider implements IProvider {
   public accessToken: string | undefined
@@ -282,7 +283,15 @@ export class JiraCloudProvider implements IProvider {
       this.getRestApiClient(3)
         .get(`/user/assignable/search?project=${projectIdOrKey}`)
         .then(async (response) => {
-          resolve(response.data as User[])
+          const users = response.data.map((cloudUser: JiraCloudUser) => ({
+            id: cloudUser.accountId,
+            name: cloudUser.name,
+            avatarUrls: cloudUser.avatarUrls,
+            displayName: cloudUser.displayName,
+            emailAddress: cloudUser.emailAddress,
+          } as User))
+
+          resolve(users as User[])
         })
         .catch((error) => {
           let specificError = error
@@ -301,8 +310,14 @@ export class JiraCloudProvider implements IProvider {
     return new Promise((resolve, reject) => {
       this.getRestApiClient(3)
         .get('/myself')
-        .then(async (response) => {
-          resolve(response.data as User)
+        .then(async (response: AxiosResponse<JiraCloudUser>) => {
+          resolve({
+            id: response.data.accountId,
+            name: response.data.name,
+            avatarUrls: response.data.avatarUrls,
+            displayName: response.data.displayName,
+            emailAddress: response.data.emailAddress,
+          } as User)
         })
         .catch((error) =>
           reject(new Error(`Error in fetching the current user: ${error}`))
@@ -649,10 +664,14 @@ export class JiraCloudProvider implements IProvider {
                 id: projectId,
               },
               reporter: {
-                id: reporter,
+                id: reporter.id,
               },
               ...(priority.id && { priority }),
-              assignee,
+              ...(assignee && {
+                assignee: {
+                  id: assignee.id,
+                }
+              }),
               description: {
                 type: "doc",
                 version: 1,
diff --git a/electron/providers/jira-cloud-provider/cloud-types.ts b/electron/providers/jira-cloud-provider/cloud-types.ts
new file mode 100644
index 00000000..d3ff1c7b
--- /dev/null
+++ b/electron/providers/jira-cloud-provider/cloud-types.ts
@@ -0,0 +1,12 @@
+export interface JiraCloudUser {
+  accountId: string
+  name: string
+  displayName: string
+  emailAddress: string
+  avatarUrls: {
+    "16x16": string
+    "24x24": string
+    "32x32": string
+    "48x48": string
+  }
+}
diff --git a/electron/providers/jira-server-provider/JiraServerProvider.ts b/electron/providers/jira-server-provider/JiraServerProvider.ts
index ce9e0b88..2db4899c 100644
--- a/electron/providers/jira-server-provider/JiraServerProvider.ts
+++ b/electron/providers/jira-server-provider/JiraServerProvider.ts
@@ -13,6 +13,7 @@ import {
 } from "../../../types"
 import {JiraIssue, JiraIssueType, JiraProject, JiraSprint,} from "../../../types/jira"
 import {IProvider} from "../base-provider"
+import {JiraServerUser} from "./server-types";
 
 export class JiraServerProvider implements IProvider {
   private loginOptions = {
@@ -72,7 +73,7 @@ export class JiraServerProvider implements IProvider {
     return instance
   }
 
-  private getRestApiClient(version: number) {
+  private getRestApiClient(version: string|number) {
     return this.constructRestBasedClient('api', version.toString());
   }
 
@@ -369,8 +370,15 @@ export class JiraServerProvider implements IProvider {
     return new Promise((resolve, reject) => {
       this.getRestApiClient(2)
         .get(`/user/assignable/search?project=${projectIdOrKey}`)
-        .then(async (response) => {
-          resolve(response.data as User[])
+        .then(async (response: AxiosResponse<JiraServerUser[]>) => {
+          const users: User[] = response.data.map((user) => ({
+            id: user.key,
+            name: user.name,
+            displayName: user.displayName,
+            avatarUrls: user.avatarUrls,
+            emailAddress: user.emailAddress,
+          } as User))
+          resolve(users)
         })
         .catch((error) => {
           if (error.response) {
@@ -391,14 +399,104 @@ export class JiraServerProvider implements IProvider {
     return new Promise((resolve, reject) => {
       this.getRestApiClient(2)
         .get('/myself')
-        .then(async (response) => resolve(response.data as User))
+        .then(async (response: AxiosResponse<JiraServerUser>) => resolve({
+          id: response.data.key,
+          name: response.data.name,
+          displayName: response.data.displayName,
+          avatarUrls: response.data.avatarUrls,
+          emailAddress: response.data.emailAddress,
+        } as User))
         .catch((error) => reject(new Error(`Error in the current user: ${error}`)))
     })
   }
   /* eslint-disable @typescript-eslint/no-unused-vars */
 
-  createIssue(issue: Issue): Promise<string> {
-    throw new Error("Method not implemented for Jira Server")
+  createIssue({
+    summary,
+    type,
+    projectId,
+    reporter,
+    assignee,
+    sprint,
+    storyPointsEstimate,
+    description,
+    status,
+    epic,
+    startDate,
+    dueDate,
+    labels,
+    priority,
+  }: Issue): Promise<string> {
+    const offsetStartDate = this.offsetDate(startDate)
+    const offsetDueDate = this.offsetDate(dueDate)
+
+    return new Promise((resolve, reject) => {
+      this.getIssueTypesByProject(projectId)
+        .then((issueTypes) => {
+          const relevantIssueType = issueTypes.find((issueType) => issueType.id === type)
+
+          this.getRestApiClient(2)
+            .post(
+              `/issue`,
+              {
+                fields: {
+                  summary,
+                  parent: { key: epic },
+                  issuetype: { id: type },
+                  project: {
+                    id: projectId,
+                  },
+                  reporter: {
+                    name: reporter.name,
+                  },
+                  ...(priority.id && { priority }),
+                  ...(assignee && {
+                    assignee: {
+                      name: assignee.name,
+                    },
+                  }),
+                  description,
+                  labels,
+                  ...(offsetStartDate && {
+                    [this.customFields.get("Start date")!]: offsetStartDate,
+                  }),
+                  ...(offsetDueDate && {
+                    [this.customFields.get("Due date")!]: offsetDueDate,
+                  }),
+                  ...(sprint &&
+                    sprint.id && {
+                      [this.customFields.get("Sprint")!]: +sprint.id,
+                    }),
+                  ...(storyPointsEstimate && {
+                    [this.customFields.get("Story point estimate")!]:
+                    storyPointsEstimate,
+                  }),
+                  ...(relevantIssueType && relevantIssueType.name === 'Epic' && {
+                    [this.customFields.get("Epic Name")!]: summary
+                  }),
+                  // ...(files && {
+                  //   [this.customFields.get("Attachment")!]: files,
+                  // }),
+                },
+              }
+            )
+            .then(async (response) => {
+              const createdIssue = response.data
+              resolve(JSON.stringify(createdIssue.key))
+              await this.setTransition(createdIssue.id, status)
+            })
+            .catch((error) => {
+              let specificError = error
+              if (error.response) {
+                if (error.response.status === 404) {
+                  specificError = new Error("The user does not have the necessary permissions")
+                }
+              }
+
+              reject(new Error(`Error creating issue: ${specificError}`))
+            })
+        })
+    })
   }
 
   getEpicsByProject(projectIdOrKey: string): Promise<Issue[]> {
@@ -660,15 +758,12 @@ export class JiraServerProvider implements IProvider {
                 },
               }),
               ...(reporter && {
-                reporter: {
-                  id: reporter,
-                },
+                reporter,
               }),
               ...(priority && priority.id && { priority }),
-              ...(assignee &&
-                assignee.id && {
-                  assignee,
-                }),
+              ...(assignee && {
+                assignee,
+              }),
               ...(description && {
                 description
               }),
diff --git a/electron/providers/jira-server-provider/server-types.ts b/electron/providers/jira-server-provider/server-types.ts
new file mode 100644
index 00000000..f1cc43ef
--- /dev/null
+++ b/electron/providers/jira-server-provider/server-types.ts
@@ -0,0 +1,12 @@
+export interface JiraServerUser {
+  key: string
+  name: string
+  displayName: string
+  emailAddress: string
+  avatarUrls: {
+    "16x16": string
+    "24x24": string
+    "32x32": string
+    "48x48": string
+  }
+}
diff --git a/src/components/BacklogView/Issue/IssueCard.tsx b/src/components/BacklogView/Issue/IssueCard.tsx
index 55410167..067397b4 100644
--- a/src/components/BacklogView/Issue/IssueCard.tsx
+++ b/src/components/BacklogView/Issue/IssueCard.tsx
@@ -151,14 +151,14 @@ export function IssueCard({
               >
                 <Tooltip
                   label={
-                    assignee.displayName !== undefined
+                    assignee?.displayName !== undefined
                       ? assignee.displayName
                       : "unassigned"
                   }
                 >
-                  {assignee.avatarUrls !== undefined ? (
+                  {assignee?.avatarUrls !== undefined ? (
                     <Avatar
-                      src={assignee?.avatarUrls["24x24"]}
+                      src={assignee.avatarUrls["24x24"]}
                       size="sm"
                       radius="xl"
                       ml={4}
diff --git a/src/components/CreateIssue/CreateIssueModal.tsx b/src/components/CreateIssue/CreateIssueModal.tsx
index 076980f8..00770cca 100644
--- a/src/components/CreateIssue/CreateIssueModal.tsx
+++ b/src/components/CreateIssue/CreateIssueModal.tsx
@@ -70,7 +70,7 @@ export function CreateIssueModal({
       description: "",
       assignee: { id: "" },
       status: "To Do",
-      reporter: currentUser?.accountId,
+      reporter: currentUser,
       priority: { id: "" },
     } as Issue,
   })
diff --git a/src/components/CreateIssue/Fields/AssigneeSelect.tsx b/src/components/CreateIssue/Fields/AssigneeSelect.tsx
index f3a8e58a..2a12b6f7 100644
--- a/src/components/CreateIssue/Fields/AssigneeSelect.tsx
+++ b/src/components/CreateIssue/Fields/AssigneeSelect.tsx
@@ -19,10 +19,10 @@ export function AssigneeSelect({
       nothingFound="Please select a project first"
       itemComponent={SelectItem}
       data={
-        !isLoading && assignableUsers && assignableUsers instanceof Array
+        !isLoading && assignableUsers
           ? assignableUsers.map((assignableUser) => ({
               image: assignableUser.avatarUrls["24x24"],
-              value: assignableUser.accountId,
+              value: assignableUser.id,
               label: assignableUser.displayName,
             }))
           : []
@@ -30,7 +30,11 @@ export function AssigneeSelect({
       clearable
       searchable
       withinPortal
-      {...form.getInputProps("assignee.id")}
+      {...form.getInputProps("assignee")}
+      value={ form.getInputProps("assignee").value?.id }
+      onChange={(value) => {
+        form.getInputProps("assignee").onChange(assignableUsers?.find((user) => user.id === value))
+      }}
     />
   )
 }
diff --git a/src/components/CreateIssue/Fields/ProjectSelect.tsx b/src/components/CreateIssue/Fields/ProjectSelect.tsx
index 8f3c2051..b9e7328a 100644
--- a/src/components/CreateIssue/Fields/ProjectSelect.tsx
+++ b/src/components/CreateIssue/Fields/ProjectSelect.tsx
@@ -28,11 +28,10 @@ export function ProjectSelect({
         form.getInputProps("projectId").onChange(value)
         form.setFieldValue("type", "")
         form.setFieldValue("status", "")
-        form.setFieldValue("assignee.id", null)
-        form.setFieldValue(
-          "reporter",
-          currentUser?.accountId || (null as unknown as string)
-        )
+        form.setFieldValue("assignee", undefined)
+        if (currentUser) {
+          form.setFieldValue("reporter", currentUser)
+        }
       }}
     />
   )
diff --git a/src/components/CreateIssue/Fields/ReporterSelect.tsx b/src/components/CreateIssue/Fields/ReporterSelect.tsx
index 9006fbfc..443f70f0 100644
--- a/src/components/CreateIssue/Fields/ReporterSelect.tsx
+++ b/src/components/CreateIssue/Fields/ReporterSelect.tsx
@@ -19,10 +19,10 @@ export function ReporterSelect({
       nothingFound="Please select a project first"
       itemComponent={SelectItem}
       data={
-        !isLoading && assignableUsers && assignableUsers instanceof Array
+        !isLoading && assignableUsers
           ? assignableUsers.map((assignableUser) => ({
               image: assignableUser.avatarUrls["24x24"],
-              value: assignableUser.accountId,
+              value: assignableUser.id,
               label: assignableUser.displayName,
             }))
           : []
@@ -31,6 +31,10 @@ export function ReporterSelect({
       searchable
       withinPortal
       {...form.getInputProps("reporter")}
+      value={ form.getInputProps("reporter").value?.id }
+      onChange={(value) => {
+        form.getInputProps("reporter").onChange(assignableUsers?.find((user) => user.id === value))
+      }}
     />
   )
 }
diff --git a/src/components/DetailView/Components/AssigneeMenu/AssigneeMenu.tsx b/src/components/DetailView/Components/AssigneeMenu/AssigneeMenu.tsx
index f734d281..7ed0ee51 100644
--- a/src/components/DetailView/Components/AssigneeMenu/AssigneeMenu.tsx
+++ b/src/components/DetailView/Components/AssigneeMenu/AssigneeMenu.tsx
@@ -74,9 +74,9 @@ export function AssigneeMenu({
       <Menu.Item
         icon={<Avatar src={user.avatarUrls["24x24"]} size="sm" radius="xl" />}
         onClick={() =>
-          editIssue.mutate({ assignee: { id: user.accountId } } as Issue)
+          editIssue.mutate({ assignee: user } as Issue)
         }
-        key={user.accountId}
+        key={user.id}
       >
         {user.displayName}
       </Menu.Item>
diff --git a/src/components/DetailView/Components/ReporterMenu.tsx b/src/components/DetailView/Components/ReporterMenu.tsx
index 953e0228..962b068f 100644
--- a/src/components/DetailView/Components/ReporterMenu.tsx
+++ b/src/components/DetailView/Components/ReporterMenu.tsx
@@ -91,8 +91,8 @@ export function ReporterMenu({ issueKey }: { issueKey: string }) {
     assignableUsers.map((user) => (
       <Menu.Item
         icon={<Avatar src={user.avatarUrls["24x24"]} size="sm" radius="xl" />}
-        onClick={() => mutation.mutate({ reporter: user.accountId } as Issue)}
-        key={user.accountId}
+        onClick={() => mutation.mutate({ reporter: user } as Issue)}
+        key={user.id}
       >
         {user.displayName}
       </Menu.Item>
diff --git a/types/index.ts b/types/index.ts
index 6717e35b..306764bb 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -14,6 +14,19 @@ export interface Project {
   type: string
 }
 
+export interface User {
+  id: string
+  name: string
+  displayName: string
+  emailAddress: string
+  avatarUrls: {
+    "16x16": string
+    "24x24": string
+    "32x32": string
+    "48x48": string
+  }
+}
+
 export interface Priority {
   statusColor: string
   description: string
@@ -41,18 +54,9 @@ export interface Issue {
   storyPointsEstimate: number
   epic: string
   labels: string[]
-  assignee: {
-    id: string
-    displayName: string
-    avatarUrls: {
-      "48x48": string
-      "24x24": string
-      "16x16": string
-      "32x32": string
-    }
-  }
+  assignee?: User
   rank: string
-  reporter: string
+  reporter: User
   sprint?: Sprint
   projectId: string
   subtasks: {
@@ -103,18 +107,6 @@ export interface IssueType {
   subtask: boolean
 }
 
-export interface User {
-  accountId: string
-  emailAddress: string
-  avatarUrls: {
-    "48x48": string
-    "24x24": string
-    "16x16": string
-    "32x32": string
-  }
-  displayName: string
-}
-
 export interface SprintCreate {
   name: string
   startDate: Date