Merge branch 'main' into archetype-filter

konveyor · Nov 15, 2023 · 8473f0b · 8473f0b
2 parents 0ceb40c + d838571
commit 8473f0b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
@@ -619,6 +619,7 @@ export interface Ticket {
   reference?: string | null;
   readonly status?: TicketStatus | null;
   error?: boolean;
+  link?: string;
 }
 
 export type Role = "Owner" | "Contributor" | null;

diff --git a/...app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx b/...app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
@@ -8,20 +8,28 @@ import {
   Button,
   Grid,
   GridItem,
+  Spinner,
 } from "@patternfly/react-core";
 import { Application } from "@app/api/models";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 import { ApplicationBusinessService } from "../application-business-service";
 import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
 import { EditIcon } from "@patternfly/react-icons";
+import { useFetchTickets } from "@app/queries/tickets";
+import { useDeleteTicketMutation } from "@app/queries/migration-waves";
+import { UnlinkIcon } from "@patternfly/react-icons";
 
 export const ApplicationDetailFields: React.FC<{
   application: Application | null;
   onEditClick: () => void;
   onCloseClick: () => void;
 }> = ({ application, onEditClick, onCloseClick }) => {
   const { t } = useTranslation();
-
+  const { tickets } = useFetchTickets();
+  const { mutate: deleteTicket, isLoading } = useDeleteTicketMutation();
+  const matchingTicket = tickets?.find(
+    (ticket) => ticket.application?.id === application?.id
+  );
   return (
     <>
       <TextContent className={spacing.mtLg}>
@@ -143,11 +151,51 @@ export const ApplicationDetailFields: React.FC<{
       <Title headingLevel="h3" size="md">
         {t("terms.migrationWave")}
       </Title>
-      <Text component="small">
+      <Text
+        component={TextVariants.small}
+        className="pf-v5-u-color-200 pf-v5-u-font-weight-light"
+      >
+        Wave name{": "}
+      </Text>
+      <Text
+        component={TextVariants.small}
+        className="pf-v5-u-color-200 pf-v5-u-font-weight-light"
+      >
         {application?.migrationWave
           ? application.migrationWave.name
           : t("terms.unassigned")}
       </Text>
+      <br />
+      <Text
+        component={TextVariants.small}
+        className="pf-v5-u-color-200 pf-v5-u-font-weight-light"
+      >
+        Ticket{": "}
+      </Text>
+      <Text
+        component={TextVariants.small}
+        className="pf-v5-u-color-200 pf-v5-u-font-weight-light"
+      >
+        {matchingTicket ? (
+          <a href={matchingTicket.link} target="_">
+            {matchingTicket?.link}
+          </a>
+        ) : (
+          t("terms.unassigned")
+        )}
+        {matchingTicket?.id ? (
+          isLoading ? (
+            <Spinner role="status" size="sm" />
+          ) : (
+            <Button
+              variant="link"
+              icon={<UnlinkIcon />}
+              onClick={() => deleteTicket(matchingTicket.id)}
+            />
+          )
+        ) : null}
+      </Text>
+
       <Title headingLevel="h3" size="md">
         {t("terms.commentsFromApplication")}
       </Title>

diff --git a/client/src/app/queries/migration-waves.ts b/client/src/app/queries/migration-waves.ts
@@ -9,7 +9,7 @@ import {
   deleteTicket,
 } from "@app/api/rest";
 import { getWavesWithStatus } from "@app/utils/waves-selector";
-import { useFetchTickets } from "./tickets";
+import { TicketsQueryKey, useFetchTickets } from "./tickets";
 import { TrackersQueryKey } from "./trackers";
 import { useFetchApplications } from "./applications";
 import { useFetchStakeholders } from "./stakeholders";
@@ -111,6 +111,7 @@ export const useDeleteTicketMutation = (
     onSuccess: (res) => {
       onSuccess && onSuccess(res);
       queryClient.invalidateQueries([MigrationWavesQueryKey]);
+      queryClient.invalidateQueries([TicketsQueryKey]);
     },
     onError: onError,
   });