Merge pull request #9114 from GilbertCherrie/fix_action_form_tag_bug

Fix action form tag bug
ManageIQ · Mar 13, 2024 · 5b640df · 5b640df
2 parents 39db732 + ce7128c
commit 5b640df
Show file tree

Hide file tree

Showing 3 changed files with 213 additions and 1 deletion.
diff --git a/app/javascript/components/action-form/action-form.schema.js b/app/javascript/components/action-form/action-form.schema.js
@@ -491,6 +491,8 @@ function createSchema(recordId, promise, inheritTags, evaluateAlert, tags, ansib
           id: 'options.tags',
           name: 'options.tags',
           label: __('Tag to Apply'),
+          isRequired: true,
+          validate: [{ type: validatorTypes.REQUIRED }],
           options: buildTags(tags, inheritTags),
         },
       ],

diff --git a/app/javascript/components/action-form/helper.js b/app/javascript/components/action-form/helper.js
@@ -187,7 +187,7 @@ const findLabel = (inheritTags, catLabel) => {
 
 const buildTags = (tags, inheritTags) => {
   const entry = Object.entries(tags);
-  const tagArray = [];
+  const tagArray = [{ label: __('<Choose>'), value: '' }];
   entry.forEach((pt) => {
     const catOptions = [];
     const tempObj = { label: pt[0], value: pt[1] };