From 6915edf06d8cdddafdbf68847e07324c2db9056f Mon Sep 17 00:00:00 2001 From: Kianna <30884335+kiannaquach@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:58:08 -0700 Subject: [PATCH] UI: [VAULT-17461] add mount configuration as toggle for pki (#23166) --- changelog/23166.txt | 3 + .../page/pki-configuration-details.hbs | 24 +---- .../pki/addon/routes/configuration/index.js | 7 ++ .../addon/templates/configuration/index.hbs | 38 ++++++-- .../page/pki-configuration-details-test.js | 91 ++----------------- 5 files changed, 47 insertions(+), 116 deletions(-) create mode 100644 changelog/23166.txt diff --git a/changelog/23166.txt b/changelog/23166.txt new file mode 100644 index 0000000000..c337767924 --- /dev/null +++ b/changelog/23166.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Update pki mount configuration details to match the new mount configuration details pattern +``` diff --git a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs b/ui/lib/pki/addon/components/page/pki-configuration-details.hbs index 2e30ebda31..60ea1118a6 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs +++ b/ui/lib/pki/addon/components/page/pki-configuration-details.hbs @@ -105,31 +105,9 @@ {{/if}} {{/if}} -{{else}} - - - - Configure - - - {{/if}} -

- Mount Configuration -

- - - - - - - - -
+
{{#if this.showDeleteAllIssuers}} - +{{else}} + + + + Configure + + + + + + Configure PKI + + +{{/if}} + + \ No newline at end of file diff --git a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js b/ui/tests/integration/components/pki/page/pki-configuration-details-test.js index a1eb817594..3ee97db4c5 100644 --- a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js +++ b/ui/tests/integration/components/pki/page/pki-configuration-details-test.js @@ -46,26 +46,12 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook unifiedCrl: true, unifiedCrlOnExistingPaths: true, }); - this.mountConfig = { - id: 'pki-test', - engineType: 'pki', - path: '/pki-test', - accessor: 'pki_33345b0d', - local: false, - sealWrap: true, - config: this.store.createRecord('mount-config', { - defaultLease: '12h', - maxLeaseTtl: '400h', - allowedManagedKeys: true, - }), - }; }); test('shows the correct information on cluster config', async function (assert) { await render(hbs`,`, { owner: this.engine, }); - assert .dom(SELECTORS.rowValue("Mount's API path")) .hasText('https://pr-a.vault.example.com/v1/ns1/pki-root', 'mount API path row renders'); @@ -74,7 +60,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook test('shows the correct information on global urls section', async function (assert) { await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); @@ -86,7 +72,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook .hasText('example.com', 'issuing certificate value renders'); this.urls.issuingCertificates = null; await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); assert @@ -102,7 +88,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook test('shows the correct information on crl section', async function (assert) { await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); @@ -128,7 +114,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook this.crl.autoRebuild = false; this.crl.enableDelta = false; await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); assert.dom(SELECTORS.rowValue('Auto-rebuild')).hasText('Off', 'it renders falsy auto build'); @@ -148,7 +134,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook this.crl.disable = true; this.crl.ocspDisable = true; await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); assert.dom(SELECTORS.rowValue('CRL building')).hasText('Disabled', 'disabled renders'); @@ -167,7 +153,7 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook this.version = this.owner.lookup('service:version'); this.version.version = '1.13.1+ent'; await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); assert.dom(SELECTORS.rowValue('Cross-cluster revocation')).hasText('Yes'); @@ -182,74 +168,11 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook this.version = this.owner.lookup('service:version'); this.version.version = '1.13.1'; await render( - hbs`,`, + hbs`,`, { owner: this.engine } ); assert.dom(SELECTORS.rowValue('Cross-cluster revocation')).doesNotExist(); assert.dom(SELECTORS.rowValue('Unified CRL')).doesNotExist(); assert.dom(SELECTORS.rowValue('Unified CRL on existing paths')).doesNotExist(); }); - - test('shows the correct information on mount configuration section', async function (assert) { - await render( - hbs`,`, - { owner: this.engine } - ); - - assert - .dom(SELECTORS.rowLabel('Secret engine type')) - .hasText('Secret engine type', 'engine type row label renders'); - assert.dom(SELECTORS.rowValue('Secret engine type')).hasText('pki', 'engine type row value renders'); - assert.dom(SELECTORS.rowLabel('Path')).hasText('Path', 'path row label renders'); - assert.dom(SELECTORS.rowValue('Path')).hasText('/pki-test', 'path row value renders'); - assert.dom(SELECTORS.rowLabel('Accessor')).hasText('Accessor', 'accessor row label renders'); - assert.dom(SELECTORS.rowValue('Accessor')).hasText('pki_33345b0d', 'accessor row value renders'); - assert.dom(SELECTORS.rowLabel('Local')).hasText('Local', 'local row label renders'); - assert.dom(SELECTORS.rowValue('Local')).hasText('No', 'local row value renders'); - assert.dom(SELECTORS.rowLabel('Seal wrap')).hasText('Seal wrap', 'seal wrap row label renders'); - assert - .dom(SELECTORS.rowValue('Seal wrap')) - .hasText('Yes', 'seal wrap row value renders Yes if sealWrap is true'); - assert.dom(SELECTORS.rowLabel('Max lease TTL')).hasText('Max lease TTL', 'max lease label renders'); - assert.dom(SELECTORS.rowValue('Max lease TTL')).hasText('400h', 'max lease value renders'); - assert - .dom(SELECTORS.rowLabel('Allowed managed keys')) - .hasText('Allowed managed keys', 'allowed managed keys label renders'); - assert - .dom(SELECTORS.rowValue('Allowed managed keys')) - .hasText('Yes', 'allowed managed keys value renders'); - }); - - test('shows mount configuration when hasConfig is false', async function (assert) { - this.urls = 403; - this.crl = 403; - - await render( - hbs`,`, - { owner: this.engine } - ); - - assert - .dom(SELECTORS.rowLabel('Secret engine type')) - .hasText('Secret engine type', 'engine type row label renders'); - assert.dom(SELECTORS.rowValue('Secret engine type')).hasText('pki', 'engine type row value renders'); - assert.dom(SELECTORS.rowLabel('Path')).hasText('Path', 'path row label renders'); - assert.dom(SELECTORS.rowValue('Path')).hasText('/pki-test', 'path row value renders'); - assert.dom(SELECTORS.rowLabel('Accessor')).hasText('Accessor', 'accessor row label renders'); - assert.dom(SELECTORS.rowValue('Accessor')).hasText('pki_33345b0d', 'accessor row value renders'); - assert.dom(SELECTORS.rowLabel('Local')).hasText('Local', 'local row label renders'); - assert.dom(SELECTORS.rowValue('Local')).hasText('No', 'local row value renders'); - assert.dom(SELECTORS.rowLabel('Seal wrap')).hasText('Seal wrap', 'seal wrap row label renders'); - assert - .dom(SELECTORS.rowValue('Seal wrap')) - .hasText('Yes', 'seal wrap row value renders Yes if sealWrap is true'); - assert.dom(SELECTORS.rowLabel('Max lease TTL')).hasText('Max lease TTL', 'max lease label renders'); - assert.dom(SELECTORS.rowValue('Max lease TTL')).hasText('400h', 'max lease value renders'); - assert - .dom(SELECTORS.rowLabel('Allowed managed keys')) - .hasText('Allowed managed keys', 'allowed managed keys label renders'); - assert - .dom(SELECTORS.rowValue('Allowed managed keys')) - .hasText('Yes', 'allowed managed keys value renders'); - }); });