Merge pull request #6235 from PanSpagetka/fix-prov-and-group-tagging

Fix tagging for Edit Group and Provisioning screens
ManageIQ · Oct 10, 2019 · c464470 · c464470
2 parents a3dee77 + a82f8fe
commit c464470
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/app/controllers/application_controller/miq_request_methods.rb b/app/controllers/application_controller/miq_request_methods.rb
@@ -1000,7 +1000,6 @@ def build_tags_for_provisioning(wf, vm_tags, edit_mode)
         :singleValue => cat[:single_value],
       }
     end
-
     assignments = Classification.find(vm_tags)
     assigned_tags = assignments.map do |tag|
       {

diff --git a/app/controllers/ops_controller/ops_rbac.rb b/app/controllers/ops_controller/ops_rbac.rb
@@ -1079,7 +1079,6 @@ def rbac_group_get_form_vars
       @edit[:new][:lookup]           = (params[:lookup] == "1")   if params[:lookup]
       @edit[:new][:user_pwd]         = params[:password]          if params[:password]
     end
-
     if params[:check]                               # User checked/unchecked a tree node
       if params[:tree_typ] == "tags"                # MyCompany tag checked
         cat_name = Classification.find_by(:id => params[:cat]).name

diff --git a/app/javascript/components/taggingWrapper.jsx b/app/javascript/components/taggingWrapper.jsx
@@ -8,21 +8,21 @@ import { http } from '../http_api';
 const params = (type = 'default', state, tag = {}) => ({
   provision: {
     id: "new",
-    ids_checked: [state.tagging.appState.assignedTags.map(t => t.values.map(val => val.id)).flat(), tag.tagValue.id].flat(),
+    ids_checked: [state.tagging.appState.assignedTags.map(t => t.values.map(val => val.id)).flat(), tag.tagValue.id || tag.tagValue[0].id].flat(),
     tree_typ: 'tags'
   },
   default: {
     id: state.tagging.appState.affectedItems[0] || "new",
     cat: tag.tagCategory.id,
-    val: tag.tagValue.id,
+    val: tag.tagValue.id || tag.tagValue[0].id,
     check: 1,
     tree_typ: 'tags'
   }
 })[type]
 
 const onDelete = (type = 'default', params = [], deleted_element) => ({
   provision: () => ({...params, check: 0, ids_checked: params.ids_checked.filter(element => element !== deleted_element) }),
-  default: ()   => params,
+  default: ()   => ({...params, check: "0"})
 })[type]
 
 class TaggingWrapper extends React.Component {

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@data-driven-forms/pf3-component-mapper": "~1.18.0",
     "@data-driven-forms/react-form-renderer": "~1.18.0",
-    "@manageiq/react-ui-components": "~0.11.48",
+    "@manageiq/react-ui-components": "~0.11.51",
     "@manageiq/ui-components": "~1.3.1",
     "@pf3/select": "~1.12.6",
     "@pf3/timeline": "~1.0.8",