UI/TTL helperEnabled/DisabledText fix (#12212)

* fixes helperTextDisabled/Enabled
This commit is contained in:
claire bontempo 2021-08-03 15:50:49 -07:00 committed by GitHub
parent 3203ad123d
commit fe7ce777dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

3
changelog/12212.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
ui: updating database TTL picker help text.
```

View File

@ -29,14 +29,14 @@ export default Model.extend({
editType: 'ttl',
defaultValue: '1h',
label: 'Generated credentialss 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 credentialss 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',

View File

@ -124,8 +124,8 @@
<TtlPicker2
@onChange={{action (action "setAndBroadcastTtl" valuePath)}}
@label={{labelString}}
@helperTextDisabled={{or attr.subText "Vault will use the default lease duration"}}
@helperTextEnabled={{or attr.subText "Lease will expire after"}}
@helperTextDisabled={{or attr.options.helperTextDisabled "Vault will use the default lease duration."}}
@helperTextEnabled={{or attr.options.helperTextEnabled "Lease will expire after"}}
@description={{attr.helpText}}
@initialValue={{or (get model valuePath) attr.options.setDefault}}
/>