diff --git a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs b/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs index c734a99376..7a37926669 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs +++ b/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs @@ -29,13 +29,17 @@ {{/each}} {{else}} - - POST /{{@backend}}/config/cluster - + + + + + POST /{{@backend}}/config/cluster + + {{/if}} @@ -48,13 +52,17 @@ {{/each}} {{else}} - - POST /{{@backend}}/config/acme - + + + + + POST /{{@backend}}/config/acme + + {{/if}} @@ -67,13 +75,17 @@ {{/each}} {{else}} - - POST /{{@backend}}/config/urls - + + + + + POST /{{@backend}}/config/urls + + {{/if}} @@ -114,12 +126,17 @@ {{/each-in}} {{/each}} {{else}} - - POST /{{@backend}}/config/crl - + + + + + POST /{{@backend}}/config/crl + + {{/if}} diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.hbs b/ui/lib/pki/addon/components/page/pki-configure-create.hbs index 050e33c2be..f402bb412c 100644 --- a/ui/lib/pki/addon/components/page/pki-configure-create.hbs +++ b/ui/lib/pki/addon/components/page/pki-configure-create.hbs @@ -58,7 +58,10 @@ @onComplete={{transition-to "vault.cluster.secrets.backend.pki.overview"}} /> {{else}} - + + + +
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-list.hbs b/ui/lib/pki/addon/components/page/pki-issuer-list.hbs index 26dc628c5e..5e2dbd678c 100644 --- a/ui/lib/pki/addon/components/page/pki-issuer-list.hbs +++ b/ui/lib/pki/addon/components/page/pki-issuer-list.hbs @@ -125,14 +125,18 @@ {{/each}} <:empty> - - - + + + + + + + \ No newline at end of file diff --git a/ui/lib/pki/addon/components/page/pki-key-list.hbs b/ui/lib/pki/addon/components/page/pki-key-list.hbs index 4d5109a9a8..a22defe240 100644 --- a/ui/lib/pki/addon/components/page/pki-key-list.hbs +++ b/ui/lib/pki/addon/components/page/pki-key-list.hbs @@ -82,18 +82,25 @@ <:empty> - + + + + <:configure> - - - + + + + + + + \ No newline at end of file diff --git a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs index 3098c4c9c5..83d46ac34f 100644 --- a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs +++ b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs @@ -97,19 +97,23 @@ {{/each}} {{/if}} {{else}} - - + + - + + + + {{/if}} {{! TIDY OPTIONS MODAL }} diff --git a/ui/lib/pki/addon/components/pki-generate-root.hbs b/ui/lib/pki/addon/components/pki-generate-root.hbs index c09cbd348f..93972b6d4a 100644 --- a/ui/lib/pki/addon/components/pki-generate-root.hbs +++ b/ui/lib/pki/addon/components/pki-generate-root.hbs @@ -101,10 +101,13 @@ /> {{/each}} {{else}} - + + + + {{/if}} {{/if}} diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs index e45bd4e935..fc61484a9c 100644 --- a/ui/lib/pki/addon/templates/certificates/index.hbs +++ b/ui/lib/pki/addon/templates/certificates/index.hbs @@ -47,20 +47,27 @@ {{/each}} <:empty> - + + + + <:configure> - - - + + + + + + + \ No newline at end of file diff --git a/ui/lib/pki/addon/templates/overview.hbs b/ui/lib/pki/addon/templates/overview.hbs index 9f85b82009..2d1535d15f 100644 --- a/ui/lib/pki/addon/templates/overview.hbs +++ b/ui/lib/pki/addon/templates/overview.hbs @@ -17,13 +17,17 @@ @canListRoles={{this.model.canListRoles}} /> {{else}} - - - + + + + + + + {{/if}} \ No newline at end of file diff --git a/ui/lib/pki/addon/templates/roles/index.hbs b/ui/lib/pki/addon/templates/roles/index.hbs index 499b25413f..9d239d6cda 100644 --- a/ui/lib/pki/addon/templates/roles/index.hbs +++ b/ui/lib/pki/addon/templates/roles/index.hbs @@ -57,20 +57,27 @@ {{/each}} <:empty> - + + + + <:configure> - - - + + + + + + + \ No newline at end of file diff --git a/ui/lib/pki/addon/templates/tidy/index.hbs b/ui/lib/pki/addon/templates/tidy/index.hbs index ca98c21e15..72267f8bba 100644 --- a/ui/lib/pki/addon/templates/tidy/index.hbs +++ b/ui/lib/pki/addon/templates/tidy/index.hbs @@ -9,13 +9,17 @@ {{else}} - - - + + + + + + + {{/if}} \ No newline at end of file diff --git a/ui/tests/acceptance/pki/pki-engine-workflow-test.js b/ui/tests/acceptance/pki/pki-engine-workflow-test.js index 10ac01c496..42bed21c6f 100644 --- a/ui/tests/acceptance/pki/pki-engine-workflow-test.js +++ b/ui/tests/acceptance/pki/pki-engine-workflow-test.js @@ -622,16 +622,14 @@ module('Acceptance | pki workflow', function (hooks) { await login(this.mixedConfigCapabilities); await visit(`/vault/secrets-engines/${this.mountPath}/pki/configuration/edit`); assert - .dom(`${PKI_CONFIG_EDIT.configEditSection} [data-test-component="empty-state"]`) - .hasText( - `You do not have permission to set this mount's the cluster config Ask your administrator if you think you should have access to: POST /${this.mountPath}/config/cluster` - ); + .dom(`${PKI_CONFIG_EDIT.configEditSection} ${GENERAL.emptyStateTitle}`) + .hasText("You do not have permission to set this mount's the cluster config"); assert.dom(PKI_CONFIG_EDIT.acmeEditSection).exists(); assert.dom(PKI_CONFIG_EDIT.urlsEditSection).exists(); assert.dom(PKI_CONFIG_EDIT.crlEditSection).exists(); - assert.dom(`${PKI_CONFIG_EDIT.acmeEditSection} [data-test-component="empty-state"]`).doesNotExist(); - assert.dom(`${PKI_CONFIG_EDIT.urlsEditSection} [data-test-component="empty-state"]`).doesNotExist(); - assert.dom(`${PKI_CONFIG_EDIT.crlEditSection} [data-test-component="empty-state"]`).doesNotExist(); + assert.dom(`${PKI_CONFIG_EDIT.acmeEditSection} ${GENERAL.emptyStateTitle}`).doesNotExist(); + assert.dom(`${PKI_CONFIG_EDIT.urlsEditSection} ${GENERAL.emptyStateTitle}`).doesNotExist(); + assert.dom(`${PKI_CONFIG_EDIT.crlEditSection} ${GENERAL.emptyStateTitle}`).doesNotExist(); await click(PKI_CONFIG_EDIT.crlToggleInput('expiry')); await click(PKI_CONFIG_EDIT.saveButton); assert.strictEqual(currentURL(), `/vault/secrets-engines/${this.mountPath}/pki/configuration`); diff --git a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js b/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js index eb78b88bf7..9c27907272 100644 --- a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js +++ b/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js @@ -9,6 +9,7 @@ import { click, fillIn, render } from '@ember/test-helpers'; import { setupEngine } from 'ember-engines/test-support'; import { hbs } from 'ember-cli-htmlbars'; import sinon from 'sinon'; +import { GENERAL } from 'vault/tests/helpers/general-selectors'; import { PKI_CONFIG_EDIT } from 'vault/tests/helpers/pki/pki-selectors'; import { configCapabilities } from 'vault/tests/helpers/pki/pki-helpers'; import PkiConfigClusterForm from 'vault/forms/secrets/pki/config/cluster'; @@ -306,25 +307,17 @@ module('Integration | Component | page/pki-configuration-edit', function (hooks) await this.renderComponent(); assert - .dom(`${PKI_CONFIG_EDIT.configEditSection} [data-test-component="empty-state"]`) - .hasText( - "You do not have permission to set this mount's the cluster config Ask your administrator if you think you should have access to: POST /pki-engine/config/cluster" - ); + .dom(`${PKI_CONFIG_EDIT.configEditSection} ${GENERAL.emptyStateTitle}`) + .hasText("You do not have permission to set this mount's the cluster config"); assert - .dom(`${PKI_CONFIG_EDIT.acmeEditSection} [data-test-component="empty-state"]`) - .hasText( - "You do not have permission to set this mount's ACME config Ask your administrator if you think you should have access to: POST /pki-engine/config/acme" - ); + .dom(`${PKI_CONFIG_EDIT.acmeEditSection} ${GENERAL.emptyStateTitle}`) + .hasText("You do not have permission to set this mount's ACME config"); assert - .dom(`${PKI_CONFIG_EDIT.urlsEditSection} [data-test-component="empty-state"]`) - .hasText( - "You do not have permission to set this mount's URLs Ask your administrator if you think you should have access to: POST /pki-engine/config/urls" - ); + .dom(`${PKI_CONFIG_EDIT.urlsEditSection} ${GENERAL.emptyStateTitle}`) + .hasText("You do not have permission to set this mount's URLs"); assert - .dom(`${PKI_CONFIG_EDIT.crlEditSection} [data-test-component="empty-state"]`) - .hasText( - "You do not have permission to set this mount's revocation configuration Ask your administrator if you think you should have access to: POST /pki-engine/config/crl" - ); + .dom(`${PKI_CONFIG_EDIT.crlEditSection} ${GENERAL.emptyStateTitle}`) + .hasText("You do not have permission to set this mount's revocation configuration"); }); test('it renders alert banner and endpoint respective error', async function (assert) {