From f112198cfddd8ab4e2fc9bc98ddf8c09a5d1cce4 Mon Sep 17 00:00:00 2001
From: Ian Bolton <ibolton@redhat.com>
Date: Wed, 15 Nov 2023 16:42:42 -0500
Subject: [PATCH 1/3] :bug: Consistent search input ID for QE (#1543)

- Requested by QE

Signed-off-by: ibolton336 <ibolton@redhat.com>
---
 client/src/app/components/FilterToolbar/SearchFilterControl.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/components/FilterToolbar/SearchFilterControl.tsx b/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
index d34f9b0751..33c782af4e 100644
--- a/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
@@ -51,7 +51,7 @@ export const SearchFilterControl = <TItem, TFilterCategoryKey extends string>({
       <InputGroup>
         <TextInput
           name={id}
-          id={id}
+          id="search-input"
           type={isNumeric ? "number" : "search"}
           onChange={(_, value) => setInputValue(value)}
           aria-label={`${category.title} filter`}

From d83857156a56457f0eee6485b4265c15cf3e6c9f Mon Sep 17 00:00:00 2001
From: Ian Bolton <ibolton@redhat.com>
Date: Wed, 15 Nov 2023 16:44:38 -0500
Subject: [PATCH 2/3] :sparkles: Add link for jira ticket in drawer view
 (#1546)

- Adds missing link for https://issues.redhat.com/browse/MTA-1539

![image](https://github.com/konveyor/tackle2-ui/assets/11218376/ebe510fa-c198-4451-9abf-a0fe850e923f)

---------

Signed-off-by: ibolton336 <ibolton@redhat.com>
---
 client/src/app/api/models.ts                  |  1 +
 .../application-detail-fields.tsx             | 52 ++++++++++++++++++-
 client/src/app/queries/migration-waves.ts     |  3 +-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
index 09a2e85683..2f2c071027 100644
--- 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/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
index 33acc20d92..fd1a083491 100644
--- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
+++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
@@ -8,12 +8,16 @@ 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;
@@ -21,7 +25,11 @@ export const ApplicationDetailFields: React.FC<{
   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
index 772bb3f227..67f103c471 100644
--- 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,
   });

From 64337c1c0dcffb4d32c7b10f1202699c45a40d66 Mon Sep 17 00:00:00 2001
From: Ian Bolton <ibolton@redhat.com>
Date: Wed, 15 Nov 2023 16:45:03 -0500
Subject: [PATCH 3/3] :bug: Allow filtering issues & dependencies by archetype
 (#1547)

Resolves remainder of https://issues.redhat.com/browse/MTA-1541

Signed-off-by: ibolton336 <ibolton@redhat.com>
---
 client/src/app/pages/issues/helpers.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/client/src/app/pages/issues/helpers.ts b/client/src/app/pages/issues/helpers.ts
index c02a7db658..c12870caab 100644
--- a/client/src/app/pages/issues/helpers.ts
+++ b/client/src/app/pages/issues/helpers.ts
@@ -20,6 +20,7 @@ import { IssueFilterGroups } from "./issues";
 import { useFetchBusinessServices } from "@app/queries/businessservices";
 import { useFetchTagsWithTagItems } from "@app/queries/tags";
 import { useTranslation } from "react-i18next";
+import { useFetchArchetypes } from "@app/queries/archetypes";
 
 // Certain filters are shared between the Issues page and the Affected Applications Page.
 // We carry these filter values between the two pages when determining the URLs to navigate between them.
@@ -38,6 +39,7 @@ export const useSharedAffectedApplicationFilterCategories = <
   const { t } = useTranslation();
   const { businessServices } = useFetchBusinessServices();
   const { tagCategories, tags, tagItems } = useFetchTagsWithTagItems();
+  const { archetypes } = useFetchArchetypes();
 
   return [
     {
@@ -51,6 +53,26 @@ export const useSharedAffectedApplicationFilterCategories = <
         }) + "...",
       getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
     },
+    {
+      key: "application.id",
+      title: t("terms.archetypes"),
+      filterGroup: IssueFilterGroups.ApplicationInventory,
+      type: FilterType.multiselect,
+      placeholderText:
+        t("actions.filterBy", {
+          what: t("terms.archetype").toLowerCase(),
+        }) + "...",
+      selectOptions: archetypes.map(({ name }) => ({ key: name, value: name })),
+      getServerFilterValue: (selectedOptions) =>
+        selectedOptions
+          ?.map((option) => archetypes.find((item) => item.name === option))
+          .filter(Boolean)
+          .flatMap(
+            ({ applications }) =>
+              applications?.map(({ id }) => String(id)) ?? []
+          )
+          .filter(Boolean),
+    },
     {
       key: "businessService.name",
       title: t("terms.businessService"),