diff --git a/changelog/12212.txt b/changelog/12212.txt new file mode 100644 index 000000000..513081594 --- /dev/null +++ b/changelog/12212.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: updating database TTL picker help text. +``` diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index cdc557c8f..17e84cf4d 100644 --- a/ui/app/models/database/role.js +++ b/ui/app/models/database/role.js @@ -29,14 +29,14 @@ export default Model.extend({ editType: 'ttl', defaultValue: '1h', label: 'Generated credentials’s Time-to-Live (TTL)', - subText: 'Vault will use the engine default of 1 hour', + helperTextDisabled: 'Vault will use a TTL of 1 hour.', defaultShown: 'Engine default', }), max_ttl: attr({ editType: 'ttl', defaultValue: '24h', label: 'Generated credentials’s maximum Time-to-Live (Max TTL)', - subText: 'Vault will use the engine default of 24 hours', + helperTextDisabled: 'Vault will use a TTL of 24 hours.', defaultShown: 'Engine default', }), username: attr('string', { @@ -45,8 +45,9 @@ export default Model.extend({ rotation_period: attr({ editType: 'ttl', defaultValue: '24h', - subText: + helperTextDisabled: 'Specifies the amount of time Vault should wait before rotating the password. The minimum is 5 seconds. Default is 24 hours.', + helperTextEnabled: 'Vault will rotate password after', }), creation_statements: attr('array', { editType: 'stringArray', diff --git a/ui/lib/core/addon/templates/components/form-field.hbs b/ui/lib/core/addon/templates/components/form-field.hbs index e0eb20209..6503d93e6 100644 --- a/ui/lib/core/addon/templates/components/form-field.hbs +++ b/ui/lib/core/addon/templates/components/form-field.hbs @@ -124,8 +124,8 @@