🐛 Add link to associated ticket (konveyor#1565)

Resolves https://issues.redhat.com/browse/MTA-701 Resolves https://issues.redhat.com/browse/MTA-1539 --------- Signed-off-by: ibolton336 <[email protected]>
sjd78 · Nov 27, 2023 · c7c6d7c · c7c6d7c
1 parent 1c663a4
commit c7c6d7c
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 53 deletions.
diff --git a/client/src/app/pages/migration-waves/components/ticket-issue.tsx b/client/src/app/pages/migration-waves/components/ticket-issue.tsx
@@ -1,25 +1,36 @@
 import React from "react";
-import { Text } from "@patternfly/react-core";
+import { Text, TextVariants } from "@patternfly/react-core";
 
 import { Ticket } from "@app/api/models";
+import { useTranslation } from "react-i18next";
+import ExternalLink from "@app/components/ExternalLink";
 import { useTrackerTypesByProjectId } from "@app/queries/trackers";
 
 export interface ITicketIssueProps {
   ticket?: Ticket;
 }
 
 export const TicketIssue: React.FC<ITicketIssueProps> = ({ ticket }) => {
-  const useTicketIssue = () => {
-    const types = useTrackerTypesByProjectId(
-      ticket?.tracker?.name,
-      ticket?.parent
-    );
-    const type = types.find((kind) => kind.id === ticket?.kind);
-    if (type) return type.name;
-    return "";
-  };
+  const { t } = useTranslation();
+  const ticketIssue = useTicketIssue(ticket);
 
-  const ticketIssue = useTicketIssue();
+  return (
+    <Text component={TextVariants.p}>
+      {ticket?.link ? (
+        <ExternalLink href={ticket.link}>{ticketIssue}</ExternalLink>
+      ) : (
+        t("terms.unassigned")
+      )}
+    </Text>
+  );
+};
+
+const useTicketIssue = (ticket?: Ticket) => {
+  const types = useTrackerTypesByProjectId(
+    ticket?.tracker?.name,
+    ticket?.parent
+  );
+  const type = types.find((kind) => kind.id === ticket?.kind);
 
-  return <Text>{ticketIssue}</Text>;
+  return type ? type.name : "";
 };
diff --git a/client/src/app/pages/migration-waves/components/wave-status-table.tsx b/client/src/app/pages/migration-waves/components/wave-status-table.tsx
@@ -27,6 +27,8 @@ import { useHistory } from "react-router-dom";
 import { useFetchTickets } from "@app/queries/tickets";
 import { Paths } from "@app/Paths";
 import { TicketIssue } from "./ticket-issue";
+import { useDeleteTicketMutation } from "@app/queries/migration-waves";
+import UnlinkIcon from "@patternfly/react-icons/dist/esm/icons/unlink-icon";
 
 export interface IWaveStatusTableProps {
   migrationWave: WaveWithStatus;
@@ -44,6 +46,7 @@ export const WaveStatusTable: React.FC<IWaveStatusTableProps> = ({
   const history = useHistory();
 
   const { tickets } = useFetchTickets();
+  const { mutate: deleteTicket } = useDeleteTicketMutation();
 
   const tableControls = useLocalTableControls({
     idProperty: "name",
@@ -130,52 +133,63 @@ export const WaveStatusTable: React.FC<IWaveStatusTableProps> = ({
           }
         >
           <Tbody>
-            {currentPageItems?.map((app, rowIndex) => (
-              <Tr key={app.name} {...getTrProps({ item: app })}>
-                <TableRowContentWithControls
-                  {...tableControls}
-                  item={app}
-                  rowIndex={rowIndex}
-                >
-                  <Td width={20} {...getTdProps({ columnKey: "appName" })}>
-                    {app.name}
-                  </Td>
-                  <Td width={20} {...getTdProps({ columnKey: "status" })}>
-                    {getTicketByApplication(tickets, app.id)?.error ? (
+            {currentPageItems?.map((app, rowIndex) => {
+              const ticket = getTicketByApplication(tickets, app.id);
+              return (
+                <Tr key={app.name} {...getTrProps({ item: app })}>
+                  <TableRowContentWithControls
+                    {...tableControls}
+                    item={app}
+                    rowIndex={rowIndex}
+                  >
+                    <Td width={20} {...getTdProps({ columnKey: "appName" })}>
+                      {app.name}
+                    </Td>
+                    <Td width={20} {...getTdProps({ columnKey: "status" })}>
+                      {getTicketByApplication(tickets, app.id)?.error ? (
+                        <Button
+                          type="button"
+                          variant="plain"
+                          onClick={() =>
+                            setCodeModalState(
+                              getTicketByApplication(tickets, app.id)
+                                ? getTicketByApplication(tickets, app.id)
+                                    ?.message
+                                : ""
+                            )
+                          }
+                        >
+                          Error
+                        </Button>
+                      ) : (
+                        getTicketByApplication(tickets, app?.id)?.status || ""
+                      )}
+                    </Td>
+                    <Td width={30} {...getTdProps({ columnKey: "issue" })}>
+                      <TicketIssue
+                        ticket={getTicketByApplication(tickets, app.id)}
+                      />
+                    </Td>
+                    <Td className={alignment.textAlignRight}>
+                      {ticket?.id && (
+                        <Button
+                          variant="link"
+                          icon={<UnlinkIcon />}
+                          onClick={() => deleteTicket(ticket.id)}
+                        />
+                      )}
                       <Button
                         type="button"
                         variant="plain"
-                        onClick={() =>
-                          setCodeModalState(
-                            getTicketByApplication(tickets, app.id)
-                              ? getTicketByApplication(tickets, app.id)?.message
-                              : ""
-                          )
-                        }
+                        onClick={() => removeApplication(migrationWave, app.id)}
                       >
-                        Error
+                        <TrashIcon />
                       </Button>
-                    ) : (
-                      getTicketByApplication(tickets, app?.id)?.status || ""
-                    )}
-                  </Td>
-                  <Td width={20} {...getTdProps({ columnKey: "issue" })}>
-                    <TicketIssue
-                      ticket={getTicketByApplication(tickets, app.id)}
-                    />
-                  </Td>
-                  <Td className={alignment.textAlignRight}>
-                    <Button
-                      type="button"
-                      variant="plain"
-                      onClick={() => removeApplication(migrationWave, app.id)}
-                    >
-                      <TrashIcon />
-                    </Button>
-                  </Td>
-                </TableRowContentWithControls>
-              </Tr>
-            ))}
+                    </Td>
+                  </TableRowContentWithControls>
+                </Tr>
+              );
+            })}
           </Tbody>
         </ConditionalTableBody>
       </Table>