From e73d2b338ef227f7393d70af1b32077060691cd9 Mon Sep 17 00:00:00 2001
From: Dallas <dallas.nicol@gmail.com>
Date: Tue, 3 Oct 2023 10:52:45 -0500
Subject: [PATCH 1/2] :bug: fix styling for ssoMenu (#1424)

addresses https://issues.redhat.com/browse/MTA-1247

was:

![image](https://github.com/konveyor/tackle2-ui/assets/5322142/bdd27aea-451c-48ee-b5c2-307d7f68be2d)


now:

![image](https://github.com/konveyor/tackle2-ui/assets/5322142/28da1332-b9c3-4110-bd9d-89a6f834716f)

---------

Signed-off-by: gitdallas <dallas.nicol@gmail.com>
---
 client/src/app/layout/HeaderApp/SSOMenu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/app/layout/HeaderApp/SSOMenu.tsx b/client/src/app/layout/HeaderApp/SSOMenu.tsx
index 27f352c8d8..d57f07ac6d 100644
--- a/client/src/app/layout/HeaderApp/SSOMenu.tsx
+++ b/client/src/app/layout/HeaderApp/SSOMenu.tsx
@@ -36,11 +36,11 @@ export const SSOMenu: React.FC = () => {
           }} /** this user dropdown is hidden on mobile sizes */
         >
           <Dropdown
-            isPlain
             onSelect={onDropdownSelect}
             isOpen={isDropdownOpen}
             toggle={(toggleRef) => (
               <MenuToggle
+                isFullHeight
                 ref={toggleRef}
                 id="sso-actions-toggle"
                 onClick={() => onDropdownToggle(!isDropdownOpen)}
@@ -75,6 +75,7 @@ export const SSOMenu: React.FC = () => {
                           history.push("/");
                         })
                         .catch((err) => {
+                          console.error("Logout failed:", err);
                           history.push("/");
                         });
                     }

From 5c99540bdd7e3a5308de2694dfb1f8eb291eedac Mon Sep 17 00:00:00 2001
From: Scott Dickerson <sdickers@redhat.com>
Date: Tue, 3 Oct 2023 16:37:20 -0400
Subject: [PATCH 2/2] :bug: Update the label for the Tag field on the
 Application Form (#1427)

Resolves: #1410
Follows up: #1408

  - The application form will only show manual tags (i.e. source="")

  - All tags are allowable for selection as a manual tag

- Change the label on the field from "Tags" to "Manual Tags" to match
the "Manual" grouping of tags in the application drawer

Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
---
 client/public/locales/en/translation.json                     | 1 +
 .../components/application-form/application-form.tsx          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index fa98976fa6..a83d6746f7 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -305,6 +305,7 @@
     "label": "Label",
     "loading": "Loading",
     "lowRisk": "Low risk",
+    "manualTags": "Manual Tags",
     "maintainers": "Maintainers",
     "mavenConfig": "Maven configuration",
     "mediumRisk": "Medium risk",
diff --git a/client/src/app/pages/applications/components/application-form/application-form.tsx b/client/src/app/pages/applications/components/application-form/application-form.tsx
index 909dc0eda4..d966829fc2 100644
--- a/client/src/app/pages/applications/components/application-form/application-form.tsx
+++ b/client/src/app/pages/applications/components/application-form/application-form.tsx
@@ -107,7 +107,7 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
 
   const nonManualTags = application?.tags?.filter((t) => t.source !== "") ?? [];
 
-  // TODO: Filter this if we want to exclude non-manual tags from manual tag selection
+  // Allow all tags to be selected manually, even if they are included from another source
   const allowedManualTags = tags;
 
   const getBinaryInitialValue = (
@@ -364,7 +364,7 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
             items={allowedManualTags}
             control={control}
             name="tags"
-            label={t("terms.tags")}
+            label={t("terms.manualTags")}
             fieldId="tags"
             noResultsMessage={t("message.noResultsFoundTitle")}
             placeholderText={t("composed.selectMany", {