luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/12212.txt Normal file
View File

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

7
ui/app/models/database/role.js
View File

@ -29,14 +29,14 @@ export default Model.extend({
editType: 'ttl', editType: 'ttl',
defaultValue: '1h', defaultValue: '1h',
label: 'Generated credentials’s Time-to-Live (TTL)', 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', defaultShown: 'Engine default',
}), }),
max_ttl: attr({ max_ttl: attr({
editType: 'ttl', editType: 'ttl',
defaultValue: '24h', defaultValue: '24h',
label: 'Generated credentials’s maximum Time-to-Live (Max TTL)', 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', defaultShown: 'Engine default',
}), }),
username: attr('string', { username: attr('string', {
@ -45,8 +45,9 @@ export default Model.extend({
rotation_period: attr({ rotation_period: attr({
editType: 'ttl', editType: 'ttl',
defaultValue: '24h', 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.', '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', { creation_statements: attr('array', {
editType: 'stringArray', editType: 'stringArray',

4
ui/lib/core/addon/templates/components/form-field.hbs
View File

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