Merge pull request #9184 from jaisejose1123/fix_vault_credentials

Fix for vault credentials in service-catalog's provisioning and retirement summary

(cherry picked from commit 36e192b)

app/helpers/catalog_helper.rb

@@ -193,7 +193,6 @@ def catalog_generic_template_info(type, record, info)
       rows.push(row_data(_('Playbook'), info[:playbook]))
       rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
       rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
       rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
       rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
       rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))

app/javascript/components/ansible-playbook-edit-catalog-form/schema.js

@@ -163,8 +163,8 @@ const provisionTabSchema = (
       },
       {
         component: componentTypes.SELECT,
-        id: 'config_info.provision.vault_credentials',
-        name: 'config_info.provision.vault_credentials',
+        id: 'config_info.provision.vault_credential_id',
+        name: 'config_info.provision.vault_credential_id',
         label: __('Vault Credential'),
         options: transformGeneralOptions(vaultCredentials),
         condition: {
@@ -371,8 +371,8 @@ const retirementTabSchema = (
       },
       {
         component: componentTypes.SELECT,
-        id: 'config_info.retirement.vault_credentials',
-        name: 'config_info.retirement.vault_credentials',
+        id: 'config_info.retirement.vault_credential_id',
+        name: 'config_info.retirement.vault_credential_id',
         label: __('Vault Credential'),
         options: transformGeneralOptions(vaultCredentials),
         condition: {