Merge branch 'main' into mta-1324

konveyor · Oct 3, 2023 · 1016fde · 1016fde
2 parents dbccb66 + 5c99540
commit 1016fde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -306,6 +306,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
@@ -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", {