Merge branch 'main' into story/add-comments-to-epic-detail-view

# Conflicts:
#	src/components/EpicDetailView/EpicDetailView.tsx

.env.example

@@ -3,5 +3,7 @@ VITE_CLIENT_ID=
 VITE_CLIENT_SECRET=
 VITE_REDIRECT_URI=
 
-
-
+# JIRA SERVER CREDENTIALS
+VITE_JIRA_SERVER_DEFAULT_URL=
+VITE_JIRA_SERVER_DEFAULT_USERNAME=
+VITE_JIRA_SERVER_DEFAULT_PASSWORD=

electron/providers/jira-cloud-provider/JiraCloudProvider.ts

@@ -410,9 +410,9 @@ export class JiraCloudProvider implements IProvider {
   async getIssuesByProject(project: string): Promise<Issue[]> {
     return new Promise((resolve, reject) => {
       this.getRestApiClient(3)
-        .get(`/search?jql=project=${project}&maxResults=10000`)
+        .get(`/search?jql=project=${project}&maxResults=10000&fields=*all`)
         .then(async (response) => {
-          resolve(this.fetchIssues(response))
+          resolve(this.fetchIssues(response, false))
         })
         .catch((error) => {
           reject(new Error(`Error fetching issues by project: ${this.handleFetchIssuesError(error)}`))
@@ -425,7 +425,7 @@ export class JiraCloudProvider implements IProvider {
       this.getAgileRestApiClient('1.0')
         .get(`/sprint/${sprintId}/issue`)
         .then(async (response) => {
-          resolve(this.fetchIssues(response))
+          resolve(this.fetchIssues(response, true))
         })
         .catch((error) => {
           reject(new Error(`Error fetching issues by sprint: ${this.handleFetchIssuesError(error)}`))
@@ -441,15 +441,15 @@ export class JiraCloudProvider implements IProvider {
       this.getAgileRestApiClient('1.0')
         .get(`/board/${boardId}/backlog?jql=project=${project}&maxResults=500`)
         .then(async (response) => {
-          resolve(this.fetchIssues(response))
+          resolve(this.fetchIssues(response, true))
         })
         .catch((error) => {
           reject(new Error(`Error fetching issues by project: ${this.handleFetchIssuesError(error)}`))
         })
     })
   }
 
-  async fetchIssues(response: AxiosResponse): Promise<Issue[]> {
+  async fetchIssues(response: AxiosResponse, isAgile: boolean): Promise<Issue[]> {
     const rankCustomField = this.customFields.get("Rank") || ""
     return new Promise((resolve) => {
       const issues: Promise<Issue[]> = Promise.all(
@@ -460,18 +460,30 @@ export class JiraCloudProvider implements IProvider {
           status: element.fields.status.name,
           type: element.fields.issuetype.name,
           storyPointsEstimate: await this.getIssueStoryPointsEstimate(element.key),
-          epic: element.fields.parent?.fields.summary,
+          epic: {
+            issueKey: element.fields.parent?.key,
+            summary: element.fields.parent?.fields.summary,
+          },
           labels: element.fields.labels,
           assignee: {
             displayName: element.fields.assignee?.displayName,
             avatarUrls: element.fields.assignee?.avatarUrls,
           },
           rank: element.fields[rankCustomField],
-          description: element.fields.description,
+          // IMPROVE: Remove boolean flag
+          description: (isAgile ? element.fields.description : element.fields.description?.content),
           subtasks: element.fields.subtasks,
           created: element.fields.created,
           updated: element.fields.updated,
-          comment: element.fields.comment,
+          comment: {
+            comments: element.fields.comment.comments.map((commentElement) => ({
+              id: commentElement.id,
+              body: (isAgile ? commentElement.body : commentElement.body[0]?.content[0]?.text),
+              author: commentElement.author,
+              created: commentElement.created,
+              updated: commentElement.updated,
+            })),
+          },
           projectId: element.fields.project.id,
           sprint: element.fields.sprint,
           attachments: element.fields.attachment,
@@ -659,7 +671,7 @@ export class JiraCloudProvider implements IProvider {
           {
             fields: {
               summary,
-              parent: { key: epic },
+              parent: { key: epic.issueKey },
               issuetype: { id: type },
               project: {
                 id: projectId,
@@ -757,8 +769,8 @@ export class JiraCloudProvider implements IProvider {
               ...(summary && {
                 summary,
               }),
-              ...(epic && {
-                parent: { key: epic },
+              ...(epic && epic.issueKey && {
+                parent: { key: epic.issueKey },
               }),
               ...(type && {
                 issuetype: { id: type },
@@ -821,7 +833,7 @@ export class JiraCloudProvider implements IProvider {
             }
           }
 
-          reject(new Error(`Error creating issue: ${specificError}`))
+          reject(new Error(`Error editing issue: ${specificError}`))
         })
     })
   }
@@ -854,7 +866,9 @@ export class JiraCloudProvider implements IProvider {
             response.data.issues.map(async (element: JiraEpic) => ({
               issueKey: element.key,
               summary: element.fields.summary,
+              epic: element.fields.epic,
               labels: element.fields.labels,
+              description: element.fields.description.content[0]?.content[0]?.text,
               assignee: {
                 displayName: element.fields.assignee?.displayName,
                 avatarUrls: element.fields.assignee?.avatarUrls,

electron/providers/jira-server-provider/JiraServerProvider.ts

@@ -294,7 +294,7 @@ export class JiraServerProvider implements IProvider {
   async getIssuesByProject(project: string, boardId: number): Promise<Issue[]> {
     return new Promise((resolve, reject) => {
       this.getAgileRestApiClient('1.0')
-        .get(`/board/${boardId}/issue?jql=project=${project}&maxResults=10000`)
+        .get(`/board/${boardId}/issue?jql=project=${project}&maxResults=10000&fields=*all`)
         .then((response) => resolve(this.fetchIssues(response)))
         .catch((error) => reject(new Error(`Error in fetching issues: ${error}`)))
     })
@@ -336,7 +336,10 @@ export class JiraServerProvider implements IProvider {
         status: element.fields.status.name,
         type: element.fields.issuetype.name,
         storyPointsEstimate: await this.getIssueStoryPointsEstimate(element.key),
-        epic: element.fields.parent?.fields.summary,
+        epic: {
+          issueKey: element.fields.parent?.key,
+          summary: element.fields.parent?.fields.summary,
+        },
         labels: element.fields.labels,
         assignee: {
           displayName: element.fields.assignee?.displayName,
@@ -515,7 +518,7 @@ export class JiraServerProvider implements IProvider {
               {
                 fields: {
                   summary,
-                  parent: { key: epic },
+                  parent: { key: epic.issueKey },
                   issuetype: { id: type },
                   project: {
                     id: projectId,
@@ -583,6 +586,9 @@ export class JiraServerProvider implements IProvider {
               issueKey: element.key,
               summary: element.fields.summary,
               labels: element.fields.labels,
+              created: element.fields.created,
+              updated: element.fields.updated,
+              description: element.fields.description.content,
               assignee: {
                 displayName: element.fields.assignee?.displayName,
                 avatarUrls: element.fields.assignee?.avatarUrls,
@@ -869,8 +875,8 @@ export class JiraServerProvider implements IProvider {
               ...(summary && {
                 summary,
               }),
-              ...(epic && {
-                parent: { key: epic },
+              ...(epic && epic.issueKey && {
+                parent: { key: epic.issueKey },
               }),
               ...(type && {
                 issuetype: { id: type },

package.json

@@ -18,10 +18,8 @@
     "lint": "eslint ./src",
     "test": "jest",
     "typecheck": "tsc --noEmit",
-    "preview": "vite preview",
     "pree2e": "yarn run package",
     "e2e": "playwright test",
-    "canvas": "yarn --cwd project-canvas start",
     "prepare": "husky install",
     "pre-commit": "lint-staged"
   },
@@ -101,6 +99,6 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/TU-TeamCanvas/ProjectCanvas"
+    "url": "https://github.com/MaibornWolff/ProjectCanvas"
   }
 }

src/components/BacklogView/Issue/DeleteButton.tsx

@@ -68,7 +68,8 @@ export function DeleteButton({
               }} />
               <DeleteIssueAlert
                 issueKey={issueKey}
-                closeModal={() => setIssuePopoverOpened(false)}
+                cancelAlert={() => setIssuePopoverOpened(false)}
+                confirmAlert={() => setIssuePopoverOpened(false)}
               />
             </Popover.Dropdown>
           </Popover>

src/components/BacklogView/Issue/IssueCard.tsx

@@ -117,9 +117,9 @@ export function IssueCard({
                     >
                       {issueKey}
                     </Text>
-                    {epic && (
+                    {epic.issueKey && (
                       <Badge mr={5} color="violet">
-                        {epic}
+                        {epic.summary}
                       </Badge>
                     )}
                     {labels?.length !== 0 &&

src/components/BacklogView/helpers/backlogHelpers.ts

@@ -64,7 +64,7 @@ export const searchIssuesFilter = (
       .issues.filter(
         (issue: Issue) =>
           issue.summary.toLowerCase().includes(currentSearch.toLowerCase()) ||
-          issue.epic?.toLowerCase().includes(currentSearch.toLowerCase()) ||
+          issue.epic.summary?.toLowerCase().includes(currentSearch.toLowerCase()) ||
           issue.assignee?.displayName
             ?.toLowerCase()
             .includes(currentSearch.toLowerCase()) ||

src/components/BacklogView/helpers/queryFetchers.ts

@@ -3,6 +3,11 @@ import { Issue, Sprint, SprintCreate } from "types"
 export const getSprints = (boardId: number): Promise<Sprint[]> =>
   window.provider.getSprints(boardId)
 
+export const getIssuesByProject = (
+  projectKey: string | undefined,
+  boardId: number
+): Promise<Issue[]> => window.provider.getIssuesByProject(projectKey || "", boardId)
+
 export const getIssuesBySprint = (
   sprintId: number | undefined
 ): Promise<Issue[]> => window.provider.getIssuesBySprint(sprintId || 0)

src/components/CreateIssue/CreateIssueModal.tsx

@@ -72,6 +72,7 @@ export function CreateIssueModal({
       status: "To Do",
       reporter: currentUser,
       priority: { id: "" },
+      epic: { issueKey: undefined }
     } as Issue,
   })
 

src/components/CreateIssue/Fields/EpicSelect.tsx

@@ -68,7 +68,7 @@ export function EpicSelect({
           searchable
           clearable
           withinPortal
-          {...form.getInputProps("epic")}
+          {...form.getInputProps("epic.issueKey")}
         />
       </Box>
     </Tooltip>

src/components/CreateIssue/Fields/IssueTypeSelect.tsx

@@ -38,7 +38,7 @@ export function IssueTypeSelect({
         ) {
           form.setFieldValue("sprintId", null as unknown as string)
           form.setFieldValue("storyPointsEstimate", null as unknown as number)
-          form.setFieldValue("epic", null as unknown as string)
+          form.setFieldValue("epic.issueKey", undefined)
         }
         form.setFieldValue("status", "To Do")
         form.setFieldValue("priority.id", null)

src/components/DetailView/Components/DeleteIssue/DeleteIssue.tsx

@@ -1,5 +1,6 @@
 import { Button, Popover } from "@mantine/core"
 import { IconTrash } from "@tabler/icons"
+import {useState} from "react";
 import { DeleteIssueAlert } from "./DeleteIssueAlert"
 
 export function DeleteIssue({
@@ -9,10 +10,22 @@ export function DeleteIssue({
   issueKey: string
   closeModal: () => void
 }) {
+  const [issuePopoverOpened, setIssuePopoverOpened] = useState(false)
+
   return (
-    <Popover width="40vh" trapFocus position="bottom" withArrow shadow="md">
+    <Popover
+      width="40vh"
+      trapFocus
+      position="bottom"
+      withArrow
+      shadow="md"
+      opened={issuePopoverOpened}
+    >
       <Popover.Target>
-        <Button color="red" rightIcon={<IconTrash size={16} />}>
+        <Button color="red" rightIcon={<IconTrash size={16} />} onClick={(e) => {
+          e.stopPropagation()
+          setIssuePopoverOpened(!issuePopoverOpened)
+        }}>
           Delete
         </Button>
       </Popover.Target>
@@ -22,7 +35,11 @@ export function DeleteIssue({
             theme.colorScheme === "dark" ? theme.colors.dark[7] : theme.white,
         })}
       >
-        <DeleteIssueAlert issueKey={issueKey} closeModal={closeModal} />
+        <DeleteIssueAlert
+          issueKey={issueKey}
+          cancelAlert={() => setIssuePopoverOpened(false)}
+          confirmAlert={closeModal}
+        />
       </Popover.Dropdown>
     </Popover>
   )

src/components/DetailView/Components/DeleteIssue/DeleteIssueAlert.tsx

@@ -5,16 +5,18 @@ import { deleteIssueMutation } from "./queries"
 
 export function DeleteIssueAlert({
   issueKey,
-  closeModal,
+  cancelAlert,
+  confirmAlert,
 }: {
   issueKey: string
-  closeModal: () => void
+  cancelAlert: () => void
+  confirmAlert: () => void
 }) {
   const queryClient = useQueryClient()
   const deleteIssue = deleteIssueMutation(queryClient)
 
   return (
-    <Stack onMouseLeave={closeModal}>
+    <Stack onMouseLeave={cancelAlert}>
       <Alert
         icon={<IconAlertCircle size={16} />}
         title="Attention!"
@@ -26,7 +28,7 @@ export function DeleteIssueAlert({
         onClick={(e) => {
           e.stopPropagation()
           deleteIssue.mutate(issueKey)
-          closeModal()
+          confirmAlert()
         }}
       >
         Confirm

src/components/DetailView/Components/EditableEpic/EditableEpic.tsx

@@ -15,20 +15,22 @@ export function EditableEpic({
 }: {
   projectId: string
   issueKey: string
-  epic: string
+  epic: {
+    issueKey?: string,
+    summary?: string,
+  }
 }) {
-  const [showEpicInput, setshowEpicInput] = useState(false)
+  const [showEpicInput, setShowEpicInput] = useState(false)
   const { data: epics } = useQuery({
     queryKey: ["epics", projectId],
     queryFn: () => getEpicsByProject(projectId),
   })
-  const [selectedEpic, setselectedEpic] = useState(epic)
+  const [selectedEpic, setSelectedEpic] = useState(epic.issueKey)
   const mutationEpic = useMutation({
-    mutationFn: (epicKey: string) =>
-      editIssue({ epic: epicKey } as Issue, issueKey),
+    mutationFn: (epicKey: string) => editIssue({ epic: { issueKey: epicKey } } as Issue, issueKey),
     onError: () => {
       showNotification({
-        message: `An error occured while modifing the Epic 😢`,
+        message: `An error occurred while modifing the Epic 😢`,
         color: "red",
       })
     },
@@ -49,7 +51,7 @@ export function EditableEpic({
           placeholder=""
           nothingFound="No Options"
           data={
-            epics && epics instanceof Array
+            epics
               ? epics.map((epicItem) => ({
                   value: epicItem.issueKey,
                   label: epicItem.summary,
@@ -61,16 +63,16 @@ export function EditableEpic({
           itemComponent={SelectItem}
           value={selectedEpic}
           onChange={(value) => {
-            setselectedEpic(value!)
+            setSelectedEpic(value!)
             mutationEpic.mutate(value!)
-            setshowEpicInput(false)
+            setShowEpicInput(false)
           }}
           w="300px"
         />
       ) : (
         <Group>
           <Text
-            onClick={() => setshowEpicInput(true)}
+            onClick={() => setShowEpicInput(true)}
             sx={{
               ":hover": { textDecoration: "underline", cursor: "pointer" },
             }}