From 22076b9db8fff982a831ef6d7ab48964203aac02 Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Thu, 29 Jul 2021 12:53:04 -0700 Subject: [PATCH 01/10] fixes helperTextDisabled/Enabled --- ui/app/models/database/role.js | 4 ++-- ui/lib/core/addon/templates/components/form-field.hbs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index cdc557c8f8ef..9bf46721df21 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 the engine default 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 the engine default of 24 hours', defaultShown: 'Engine default', }), username: attr('string', { diff --git a/ui/lib/core/addon/templates/components/form-field.hbs b/ui/lib/core/addon/templates/components/form-field.hbs index e0eb202095d2..d38088631511 100644 --- a/ui/lib/core/addon/templates/components/form-field.hbs +++ b/ui/lib/core/addon/templates/components/form-field.hbs @@ -121,11 +121,12 @@ {{else if (eq attr.options.editType "ttl")}} {{!-- TTL Picker --}}
+ {{log attr.options}} From fafcf8b066391fc241a18113ebd7162e61e50bbe Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Thu, 29 Jul 2021 12:59:47 -0700 Subject: [PATCH 02/10] changes rotation_period' --- ui/app/models/database/role.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index 9bf46721df21..6a9a2f6ef8f5 100644 --- a/ui/app/models/database/role.js +++ b/ui/app/models/database/role.js @@ -45,7 +45,7 @@ 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.', }), creation_statements: attr('array', { From 5761997cbae1830b84b4f60660596948ef354d4b Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Thu, 29 Jul 2021 14:17:50 -0700 Subject: [PATCH 03/10] woops didnt mean to change rotation_period --- ui/app/models/database/role.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index 6a9a2f6ef8f5..9bf46721df21 100644 --- a/ui/app/models/database/role.js +++ b/ui/app/models/database/role.js @@ -45,7 +45,7 @@ export default Model.extend({ rotation_period: attr({ editType: 'ttl', defaultValue: '24h', - helperTextDisabled: + subText: 'Specifies the amount of time Vault should wait before rotating the password. The minimum is 5 seconds. Default is 24 hours.', }), creation_statements: attr('array', { From 94e9ff1ce131443e57e99ecd217e80ada9f7aa86 Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Thu, 29 Jul 2021 15:17:41 -0700 Subject: [PATCH 04/10] change text --- ui/app/models/database/role.js | 2 +- ui/lib/core/addon/templates/components/form-field.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index 9bf46721df21..6a9a2f6ef8f5 100644 --- a/ui/app/models/database/role.js +++ b/ui/app/models/database/role.js @@ -45,7 +45,7 @@ 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.', }), creation_statements: attr('array', { diff --git a/ui/lib/core/addon/templates/components/form-field.hbs b/ui/lib/core/addon/templates/components/form-field.hbs index d38088631511..d0de9fda3d84 100644 --- a/ui/lib/core/addon/templates/components/form-field.hbs +++ b/ui/lib/core/addon/templates/components/form-field.hbs @@ -125,7 +125,7 @@ Date: Thu, 29 Jul 2021 15:32:46 -0700 Subject: [PATCH 05/10] remove log --- ui/lib/core/addon/templates/components/form-field.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/lib/core/addon/templates/components/form-field.hbs b/ui/lib/core/addon/templates/components/form-field.hbs index d0de9fda3d84..6503d93e6069 100644 --- a/ui/lib/core/addon/templates/components/form-field.hbs +++ b/ui/lib/core/addon/templates/components/form-field.hbs @@ -121,7 +121,6 @@ {{else if (eq attr.options.editType "ttl")}} {{!-- TTL Picker --}}
- {{log attr.options}} Date: Thu, 29 Jul 2021 15:46:13 -0700 Subject: [PATCH 06/10] adds enabled text to rotation period --- changelog/12212.txt | 0 ui/app/models/database/role.js | 1 + 2 files changed, 1 insertion(+) create mode 100644 changelog/12212.txt diff --git a/changelog/12212.txt b/changelog/12212.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index 6a9a2f6ef8f5..eb125d0f5494 100644 --- a/ui/app/models/database/role.js +++ b/ui/app/models/database/role.js @@ -47,6 +47,7 @@ export default Model.extend({ defaultValue: '24h', 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', From 0aec6e00b19ab95b555faaa7280a60d6d0d99472 Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Thu, 29 Jul 2021 15:48:37 -0700 Subject: [PATCH 07/10] adds changelog: --- changelog/12212.txt | 3 +++ ui/lib/core/stories/read-more.stories.js | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changelog/12212.txt b/changelog/12212.txt index e69de29bb2d1..5130815943e2 100644 --- 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/lib/core/stories/read-more.stories.js b/ui/lib/core/stories/read-more.stories.js index 237695aea3fd..987cead809fe 100644 --- a/ui/lib/core/stories/read-more.stories.js +++ b/ui/lib/core/stories/read-more.stories.js @@ -9,11 +9,11 @@ storiesOf('ReadMore', module) template: hbs`
Read More
NOTE: normally this component has a "See More" button when it truncates text (which is calculated in the .js file). The button is clickable and will expand the height of the outer box (shown here with a black outline).
-
- - Anything can go in here Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam volutpat vulputate lacus sit amet lobortis. Nulla fermentum porta consequat. Mauris porttitor libero nibh, ac facilisis ex molestie non. Nulla dolor est, pharetra et maximus vel, varius eu augue. Maecenas eget nisl convallis, vehicula massa quis, pharetra justo. - -
+
+ + Anything can go in here Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam volutpat vulputate lacus sit amet lobortis. Nulla fermentum porta consequat. Mauris porttitor libero nibh, ac facilisis ex molestie non. Nulla dolor est, pharetra et maximus vel, varius eu augue. Maecenas eget nisl convallis, vehicula massa quis, pharetra justo. + +
`, context: {}, })); From e9d35b66c855ecf31e6489f86ae4b3b366b7d85d Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Fri, 30 Jul 2021 09:34:17 -0700 Subject: [PATCH 08/10] removes indentation --- ui/lib/core/stories/read-more.stories.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/lib/core/stories/read-more.stories.js b/ui/lib/core/stories/read-more.stories.js index 987cead809fe..237695aea3fd 100644 --- a/ui/lib/core/stories/read-more.stories.js +++ b/ui/lib/core/stories/read-more.stories.js @@ -9,11 +9,11 @@ storiesOf('ReadMore', module) template: hbs`
Read More
NOTE: normally this component has a "See More" button when it truncates text (which is calculated in the .js file). The button is clickable and will expand the height of the outer box (shown here with a black outline).
-
- - Anything can go in here Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam volutpat vulputate lacus sit amet lobortis. Nulla fermentum porta consequat. Mauris porttitor libero nibh, ac facilisis ex molestie non. Nulla dolor est, pharetra et maximus vel, varius eu augue. Maecenas eget nisl convallis, vehicula massa quis, pharetra justo. - -
+
+ + Anything can go in here Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam volutpat vulputate lacus sit amet lobortis. Nulla fermentum porta consequat. Mauris porttitor libero nibh, ac facilisis ex molestie non. Nulla dolor est, pharetra et maximus vel, varius eu augue. Maecenas eget nisl convallis, vehicula massa quis, pharetra justo. + +
`, context: {}, })); From 049ad680c16c15858179798b2d621357ed109bbb Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Fri, 30 Jul 2021 14:16:44 -0700 Subject: [PATCH 09/10] changes text --- ui/app/models/database/role.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index eb125d0f5494..987fea7444a0 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)', - helperTextDisabled: '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)', - helperTextDisabled: 'Vault will use the engine default of 24 hours', + helperTextDisabled: 'Vault will use a TTL of 24 hours', defaultShown: 'Engine default', }), username: attr('string', { From ceb3392ad1451c0a3ea9ddd171fef47e12dfd313 Mon Sep 17 00:00:00 2001 From: Claire Bontempo Date: Fri, 30 Jul 2021 14:33:00 -0700 Subject: [PATCH 10/10] add period --- ui/app/models/database/role.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js index 987fea7444a0..17e84cf4d380 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)', - helperTextDisabled: 'Vault will use a TTL 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)', - helperTextDisabled: 'Vault will use a TTL of 24 hours', + helperTextDisabled: 'Vault will use a TTL of 24 hours.', defaultShown: 'Engine default', }), username: attr('string', {