UI/TTL helperEnabled/DisabledText fix (#12212)

* fixes helperTextDisabled/Enabled
hashicorp · Aug 3, 2021 · 87fe00c · 87fe00c
1 parent 01a3440
commit 87fe00c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/changelog/12212.txt 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
@@ -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
@@ -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}}
     />