From f389036a58021387445a6da87cb3e4dc87f57c45 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 28 Sep 2021 10:39:51 -0600 Subject: [PATCH 1/6] add created time for secret version view --- ui/app/styles/components/info-table-row.scss | 4 ++++ ui/app/templates/components/secret-form-show.hbs | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ui/app/styles/components/info-table-row.scss b/ui/app/styles/components/info-table-row.scss index 6c12508273094..39902603e1e74 100644 --- a/ui/app/styles/components/info-table-row.scss +++ b/ui/app/styles/components/info-table-row.scss @@ -35,6 +35,10 @@ .helper-text { font-weight: normal; } + &.justify-right { + display: flex; + justify-content: right; + } } .hs-icon { diff --git a/ui/app/templates/components/secret-form-show.hbs b/ui/app/templates/components/secret-form-show.hbs index 543c3c192aef1..a447ff33d6476 100644 --- a/ui/app/templates/components/secret-form-show.hbs +++ b/ui/app/templates/components/secret-form-show.hbs @@ -47,6 +47,9 @@
Value
+
+ Version created {{date-format @modelForData.createdTime 'MMM dd, yyyy hh:mm a'}} +
{{#if @modelForData.secretKeyAndValue}} From 63ad8949857b367af2c607efc0221d8b8f1cf133 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 28 Sep 2021 11:13:59 -0600 Subject: [PATCH 2/6] complete functionality --- ui/app/styles/components/list-item-row.scss | 8 ++++++++ ui/app/styles/components/tool-tip.scss | 3 +++ .../templates/components/secret-form-show.hbs | 11 ++++++++++- .../vault/cluster/secrets/backend/versions.hbs | 17 +++++++++++++++-- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ui/app/styles/components/list-item-row.scss b/ui/app/styles/components/list-item-row.scss index bdcf2f3c6927e..2558358990b05 100644 --- a/ui/app/styles/components/list-item-row.scss +++ b/ui/app/styles/components/list-item-row.scss @@ -8,6 +8,14 @@ .ember-basic-dropdown-trigger { display: inline-block; } + + .center-inside-row { + width: 50%; + margin-left: auto; + font-size: $size-8; + font-weight: $font-weight-semibold; + color: $ui-gray-500; + } } a.list-item-row, diff --git a/ui/app/styles/components/tool-tip.scss b/ui/app/styles/components/tool-tip.scss index c36584c8758c7..392f898da13b9 100644 --- a/ui/app/styles/components/tool-tip.scss +++ b/ui/app/styles/components/tool-tip.scss @@ -23,6 +23,9 @@ &.ember-basic-dropdown-content--above.ember-basic-dropdown--transitioning-out { animation: drop-fade-below 0.15s reverse; } + &.smaller-font { + font-size: $size-8; + } } .ember-basic-dropdown-content--left.tool-tip { diff --git a/ui/app/templates/components/secret-form-show.hbs b/ui/app/templates/components/secret-form-show.hbs index a447ff33d6476..0167c3c970dae 100644 --- a/ui/app/templates/components/secret-form-show.hbs +++ b/ui/app/templates/components/secret-form-show.hbs @@ -48,7 +48,16 @@ Value
- Version created {{date-format @modelForData.createdTime 'MMM dd, yyyy hh:mm a'}} + + + Version created {{date-format @modelForData.createdTime 'MMM dd, yyyy hh:mm a'}} + + +
+ {{@modelForData.createdTime}} +
+
+
diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs index ea0c579620fb9..3274d6ca4af71 100644 --- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs +++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs @@ -27,7 +27,7 @@
- + Version {{list.item.version}}
{{#if (eq list.item.version model.currentVersion)}} @@ -50,9 +50,22 @@ Destroyed
- {{/if}} + {{/if}} +
+ + + Created {{date-format model.createdTime 'MMM dd, yyyy hh:mm a'}} + + +
+ {{model.createdTime}} +
+
+
+
+ Date: Tue, 28 Sep 2021 11:55:39 -0600 Subject: [PATCH 3/6] test coverage --- ui/app/templates/components/secret-form-show.hbs | 2 +- ui/tests/acceptance/secrets/backend/kv/secret-test.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/app/templates/components/secret-form-show.hbs b/ui/app/templates/components/secret-form-show.hbs index 0167c3c970dae..3f0c3eb7682d1 100644 --- a/ui/app/templates/components/secret-form-show.hbs +++ b/ui/app/templates/components/secret-form-show.hbs @@ -49,7 +49,7 @@
- + Version created {{date-format @modelForData.createdTime 'MMM dd, yyyy hh:mm a'}} diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js index e83b380cc6a7a..0f827f0a1c736 100644 --- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js +++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js @@ -226,6 +226,8 @@ module('Acceptance | secrets/secret/create', function(hooks) { test('it navigates to version history and to a specific version', async function(assert) { const path = `kv-path-${new Date().getTime()}`; + let today = new Date(); + let month = today.toString().split(' ')[1]; await listPage.visitRoot({ backend: 'secret' }); await settled(); await listPage.create(); @@ -233,11 +235,13 @@ module('Acceptance | secrets/secret/create', function(hooks) { await editPage.createSecret(path, 'foo', 'bar'); await click('[data-test-popup-menu-trigger="version"]'); await settled(); + assert.dom('[ data-test-created-time]').includesText(month, 'created time shows todays month'); + await click('[data-test-version-history]'); await settled(); assert .dom('[data-test-list-item-content]') - .hasText('Version 1 Current', 'shows version one data on the version history as current'); + .includesText('Version 1 Current', 'shows version one data on the version history as current'); assert.dom('[data-test-list-item-content]').exists({ count: 1 }, 'renders a single version'); await click('.linked-block'); From 58c7ff2fa5671e61a713566cbc63bdc60454bdee Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 28 Sep 2021 11:57:37 -0600 Subject: [PATCH 4/6] changelog --- changelog/12663.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/12663.txt diff --git a/changelog/12663.txt b/changelog/12663.txt new file mode 100644 index 0000000000000..aab6e380b178f --- /dev/null +++ b/changelog/12663.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Add creation time to KV 2 version history and version view +``` From 8f2faf520d979b845a3d47b1a255471ea1dda8fc Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 28 Sep 2021 12:01:17 -0600 Subject: [PATCH 5/6] version per list item --- ui/app/templates/vault/cluster/secrets/backend/versions.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs index 3274d6ca4af71..b9809f254fe5d 100644 --- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs +++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs @@ -54,11 +54,11 @@
- Created {{date-format model.createdTime 'MMM dd, yyyy hh:mm a'}} + Created {{date-format list.item.createdTime 'MMM dd, yyyy hh:mm a'}}
- {{model.createdTime}} + {{list.item.createdTime}}
From c97fe61848ba58f1586aaa277c7d45d0b9fa7342 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 28 Sep 2021 12:02:38 -0600 Subject: [PATCH 6/6] clean up --- ui/app/templates/vault/cluster/secrets/backend/versions.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs index b9809f254fe5d..f5d9cbb5bbaec 100644 --- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs +++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs @@ -65,7 +65,6 @@
-