Merge branch 'main' into broken-analysis-download

konveyor · Oct 3, 2023 · a60e1c6 · a60e1c6
2 parents 4a2a284 + 5c99540
commit a60e1c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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/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("/");
                         });
                     }

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
@@ -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", {