diff --git a/ui/lib/ldap/addon/components/page/roles.hbs b/ui/lib/ldap/addon/components/page/roles.hbs
index 305dbfba15df..305902038cc1 100644
--- a/ui/lib/ldap/addon/components/page/roles.hbs
+++ b/ui/lib/ldap/addon/components/page/roles.hbs
@@ -38,11 +38,7 @@
data-test-config-cta
@title="No roles created yet"
@message="Roles in Vault will allow you to manage LDAP credentials. Create a role to get started."
- >
-
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 6942dacc1c8c..95ee744127df 100644
--- a/ui/lib/pki/addon/components/page/pki-issuer-list.hbs
+++ b/ui/lib/pki/addon/components/page/pki-issuer-list.hbs
@@ -108,9 +108,12 @@
<:empty>
-
- Configure PKI
-
+
\ 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 3dbdcb8d401f..08131d0247ce 100644
--- a/ui/lib/pki/addon/components/page/pki-key-list.hbs
+++ b/ui/lib/pki/addon/components/page/pki-key-list.hbs
@@ -79,9 +79,12 @@
<:configure>
-
- Configure PKI
-
+
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs
index 345240ae9cd6..f14b4bb12560 100644
--- a/ui/lib/pki/addon/templates/certificates/index.hbs
+++ b/ui/lib/pki/addon/templates/certificates/index.hbs
@@ -44,22 +44,19 @@
{{/each}}
<:empty>
-
-
-
When created, certificates will be listed here. Select a role to start generating certificates.
-
-
- View roles
-
-
-
+
<:configure>
-
- Configure PKI
-
+
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/index.hbs b/ui/lib/pki/addon/templates/configuration/index.hbs
index c2261e7a0350..d7200b3271e5 100644
--- a/ui/lib/pki/addon/templates/configuration/index.hbs
+++ b/ui/lib/pki/addon/templates/configuration/index.hbs
@@ -24,9 +24,12 @@
-
- Configure PKI
-
+
{{/if}}
diff --git a/ui/lib/pki/addon/templates/overview.hbs b/ui/lib/pki/addon/templates/overview.hbs
index ac6d3d18cc4b..7a898c7514cf 100644
--- a/ui/lib/pki/addon/templates/overview.hbs
+++ b/ui/lib/pki/addon/templates/overview.hbs
@@ -19,8 +19,11 @@
{{else}}
-
- Configure PKI
-
+
{{/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 c1c2f86f09dd..265a2c192f0d 100644
--- a/ui/lib/pki/addon/templates/roles/index.hbs
+++ b/ui/lib/pki/addon/templates/roles/index.hbs
@@ -50,22 +50,19 @@
{{/each}}
<:empty>
-
-
-
When created, roles will be listed here. Create a role to start generating certificates.
-
-
- Create role
-
-
-
+
<:configure>
-
- Configure PKI
-
+
\ 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 ba84950286d8..e974bc3d81eb 100644
--- a/ui/lib/pki/addon/templates/tidy/index.hbs
+++ b/ui/lib/pki/addon/templates/tidy/index.hbs
@@ -10,8 +10,11 @@
{{else}}
-
- Configure PKI
-
+
{{/if}}
\ No newline at end of file
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
index b63f4c784905..d41be803a22e 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
@@ -68,14 +68,12 @@
@title="No known {{this.performanceMode}} secondary clusters associated with this cluster"
@message="Associated secondary clusters will be listed here. Add your first secondary cluster to get started."
>
- {{#if this.model.canAddSecondary}}
-
- Add secondary
-
- {{/if}}
-
- Learn more
-
+
{{/if}}
{{/if}}
\ No newline at end of file
diff --git a/ui/lib/sync/addon/components/secrets/page/overview.hbs b/ui/lib/sync/addon/components/secrets/page/overview.hbs
index ccb38629c493..1273e241a21e 100644
--- a/ui/lib/sync/addon/components/secrets/page/overview.hbs
+++ b/ui/lib/sync/addon/components/secrets/page/overview.hbs
@@ -48,9 +48,12 @@
@title="Error fetching information"
@message="Ensure that the policy has access to read sync associations."
>
-
- API reference
-
+
{{else}}
diff --git a/ui/tests/acceptance/oidc-config/providers-scopes-test.js b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
index af06edc1a827..472fa443bc02 100644
--- a/ui/tests/acceptance/oidc-config/providers-scopes-test.js
+++ b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
@@ -53,12 +53,12 @@ module('Acceptance | oidc-config providers and scopes', function (hooks) {
assert
.dom(SELECTORS.scopeEmptyState)
.hasText(
- `No scopes yet Use scope to define identity information about the authenticated user. Learn more. Create scope`,
+ `No scopes yet Use scope to define identity information about the authenticated user. OIDC provider scopes`,
'renders empty state no scopes are configured'
);
assert
- .dom(SELECTORS.scopeCreateButtonEmptyState)
- .hasAttribute('href', '/ui/vault/access/oidc/scopes/create', 'empty state renders create scope link');
+ .dom(SELECTORS.scopeCreateButton)
+ .hasAttribute('href', '/ui/vault/access/oidc/scopes/create', 'toolbar renders create scope link');
});
// LIST SCOPE EXIST
diff --git a/ui/tests/acceptance/secrets/backend/database/secret-test.js b/ui/tests/acceptance/secrets/backend/database/secret-test.js
index 2a42cfceb519..58cd3915cf5f 100644
--- a/ui/tests/acceptance/secrets/backend/database/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/database/secret-test.js
@@ -558,7 +558,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
assert.dom('[data-test-secret-list-tab="Roles"]').exists('renders connections tab');
await click('[data-test-secret-create="connections"]');
- assert.strictEqual(currentURL(), `/vault/secrets/${backend}/create`);
+ assert.strictEqual(currentURL(), `/vault/secrets/${backend}/create?itemType=connection`);
// Login with restricted policy
await logout.visit();
diff --git a/ui/tests/acceptance/secrets/backend/database/workflow-test.js b/ui/tests/acceptance/secrets/backend/database/workflow-test.js
index 41c23dec5bfb..2266c2625ca9 100644
--- a/ui/tests/acceptance/secrets/backend/database/workflow-test.js
+++ b/ui/tests/acceptance/secrets/backend/database/workflow-test.js
@@ -99,7 +99,11 @@ module('Acceptance | database workflow', function (hooks) {
await visit(`/vault/secrets/${this.backend}/overview`);
assert.dom(PAGE.emptyStateTitle).hasText('Connect a database', 'empty state title is correct');
await click(PAGE.emptyStateAction);
- assert.strictEqual(currentURL(), `/vault/secrets/${this.backend}/create`, 'Takes you to create page');
+ assert.strictEqual(
+ currentURL(),
+ `/vault/secrets/${this.backend}/create?itemType=connection`,
+ 'Takes you to create page'
+ );
// fill in connection details
await fillOutConnection(`connect-${this.backend}`);
@@ -128,7 +132,11 @@ module('Acceptance | database workflow', function (hooks) {
await visit(`/vault/secrets/${this.backend}/overview`);
assert.dom(PAGE.emptyStateTitle).hasText('Connect a database', 'empty state title is correct');
await click(PAGE.emptyStateAction);
- assert.strictEqual(currentURL(), `/vault/secrets/${this.backend}/create`, 'Takes you to create page');
+ assert.strictEqual(
+ currentURL(),
+ `/vault/secrets/${this.backend}/create?itemType=connection`,
+ 'Takes you to create page'
+ );
// fill in connection details
await fillOutConnection(`connect-${this.backend}`);
@@ -158,7 +166,11 @@ module('Acceptance | database workflow', function (hooks) {
await visit(`/vault/secrets/${this.backend}/overview`);
assert.dom(PAGE.emptyStateTitle).hasText('Connect a database', 'empty state title is correct');
await click(PAGE.emptyStateAction);
- assert.strictEqual(currentURL(), `/vault/secrets/${this.backend}/create`, 'Takes you to create page');
+ assert.strictEqual(
+ currentURL(),
+ `/vault/secrets/${this.backend}/create?itemType=connection`,
+ 'Takes you to create page'
+ );
// fill in connection details
await fillOutConnection(`bad-connection`);
@@ -189,7 +201,11 @@ module('Acceptance | database workflow', function (hooks) {
await visit(`/vault/secrets/${this.backend}/overview`);
assert.dom(PAGE.emptyStateTitle).hasText('Connect a database', 'empty state title is correct');
await click(PAGE.emptyStateAction);
- assert.strictEqual(currentURL(), `/vault/secrets/${this.backend}/create`, 'Takes you to create page');
+ assert.strictEqual(
+ currentURL(),
+ `/vault/secrets/${this.backend}/create?itemType=connection`,
+ 'Takes you to create page'
+ );
// fill in connection details
await fillOutConnection(`fail-rotate`);
diff --git a/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-navigation-test.js b/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-navigation-test.js
index b1369e35e1e4..015683faeca0 100644
--- a/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-navigation-test.js
+++ b/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-navigation-test.js
@@ -108,7 +108,7 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
return;
});
test('empty backend - breadcrumbs, title, tabs, emptyState (a)', async function (assert) {
- assert.expect(18);
+ assert.expect(15);
const backend = this.emptyBackend;
await navToBackend(backend);
@@ -128,23 +128,8 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
assert.dom(PAGE.list.filter).doesNotExist('List filter does not show because no secrets exists.');
// Page content correct
assert.dom(PAGE.emptyStateTitle).hasText('No secrets yet');
- assert.dom(PAGE.emptyStateActions).hasText('Create secret');
assert.dom(PAGE.list.createSecret).hasText('Create secret');
- // Click empty state CTA
- await click(`${PAGE.emptyStateActions} a`);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/create`),
- `url includes /vault/secrets/${backend}/kv/create`
- );
-
- // Click cancel btn
- await click(FORM.cancelBtn);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/list`),
- `url includes /vault/secrets/${backend}/kv/list`
- );
-
// click toolbar CTA
await click(PAGE.list.createSecret);
assert.ok(
@@ -551,7 +536,7 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
return;
});
test('empty backend - breadcrumbs, title, tabs, emptyState (dlr)', async function (assert) {
- assert.expect(18);
+ assert.expect(15);
const backend = this.emptyBackend;
await navToBackend(backend);
@@ -571,23 +556,8 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
assert.dom(PAGE.list.filter).doesNotExist('List filter does not show because no secrets exists.');
// Page content correct
assert.dom(PAGE.emptyStateTitle).hasText('No secrets yet');
- assert.dom(PAGE.emptyStateActions).hasText('Create secret');
assert.dom(PAGE.list.createSecret).hasText('Create secret');
- // Click empty state CTA
- await click(`${PAGE.emptyStateActions} a`);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/create`),
- `url includes /vault/secrets/${backend}/kv/create`
- );
-
- // Click cancel btn
- await click(FORM.cancelBtn);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/list`),
- `url includes /vault/secrets/${backend}/kv/list`
- );
-
// click toolbar CTA
await click(PAGE.list.createSecret);
assert.ok(
@@ -737,7 +707,7 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
return;
});
test('empty backend - breadcrumbs, title, tabs, emptyState (mm)', async function (assert) {
- assert.expect(18);
+ assert.expect(15);
const backend = this.emptyBackend;
await navToBackend(backend);
@@ -757,23 +727,8 @@ module('Acceptance | kv-v2 workflow | navigation', function (hooks) {
assert.dom(PAGE.list.filter).doesNotExist('List filter does not show because no secrets exists.');
// Page content correct
assert.dom(PAGE.emptyStateTitle).hasText('No secrets yet');
- assert.dom(PAGE.emptyStateActions).hasText('Create secret');
assert.dom(PAGE.list.createSecret).hasText('Create secret');
- // Click empty state CTA
- await click(`${PAGE.emptyStateActions} a`);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/create`),
- `url includes /vault/secrets/${backend}/kv/create`
- );
-
- // Click cancel btn
- await click(FORM.cancelBtn);
- assert.ok(
- currentURL().startsWith(`/vault/secrets/${backend}/kv/list`),
- `url includes /vault/secrets/${backend}/kv/list`
- );
-
// click toolbar CTA
await click(PAGE.list.createSecret);
assert.ok(
diff --git a/ui/tests/helpers/oidc-config.js b/ui/tests/helpers/oidc-config.js
index 670de3e4c93b..a226d8e1df8d 100644
--- a/ui/tests/helpers/oidc-config.js
+++ b/ui/tests/helpers/oidc-config.js
@@ -37,7 +37,6 @@ export const SELECTORS = {
scopeEditButton: '[data-test-oidc-scope-edit]',
scopeDetailsTab: '[data-test-oidc-scope-details]',
scopeEmptyState: '[data-test-oidc-scope-empty-state]',
- scopeCreateButtonEmptyState: '[data-test-oidc-scope-create-empty-state]',
scopeCreateButton: '[data-test-oidc-scope-create]',
// key route
diff --git a/ui/tests/integration/components/kubernetes/page/roles-test.js b/ui/tests/integration/components/kubernetes/page/roles-test.js
index 42e5d9420596..a1ce17a813f1 100644
--- a/ui/tests/integration/components/kubernetes/page/roles-test.js
+++ b/ui/tests/integration/components/kubernetes/page/roles-test.js
@@ -76,7 +76,6 @@ module('Integration | Component | kubernetes | Page::Roles', function (hooks) {
'When created, roles will be listed here. Create a role to start generating service account tokens.',
'Message renders'
);
- assert.dom('[data-test-empty-state-actions] a').hasText('Create role', 'Action renders');
});
test('it should render no matches filter message', async function (assert) {
diff --git a/ui/tests/integration/components/ldap/page/libraries-test.js b/ui/tests/integration/components/ldap/page/libraries-test.js
index dea26f9fb61c..42c27c99af2f 100644
--- a/ui/tests/integration/components/ldap/page/libraries-test.js
+++ b/ui/tests/integration/components/ldap/page/libraries-test.js
@@ -87,7 +87,6 @@ module('Integration | Component | ldap | Page::Libraries', function (hooks) {
'Use libraries to manage a set of highly privileged accounts that can be shared among a team.',
'Message renders'
);
- assert.dom('[data-test-empty-state-actions] a').hasText('Create library', 'Action renders');
});
test('it should render libraries list', async function (assert) {
diff --git a/ui/tests/integration/components/ldap/page/roles-test.js b/ui/tests/integration/components/ldap/page/roles-test.js
index ebe8b3ad74ef..97d293a2deac 100644
--- a/ui/tests/integration/components/ldap/page/roles-test.js
+++ b/ui/tests/integration/components/ldap/page/roles-test.js
@@ -89,7 +89,6 @@ module('Integration | Component | ldap | Page::Roles', function (hooks) {
'Roles in Vault will allow you to manage LDAP credentials. Create a role to get started.',
'Message renders'
);
- assert.dom('[data-test-empty-state-actions] a').hasText('Create role', 'Action renders');
});
test('it should render roles list', async function (assert) {