diff --git a/ui/lib/pki/addon/routes/certificates/index.js b/ui/lib/pki/addon/routes/certificates/index.js index dfd49a9e49..401aee5508 100644 --- a/ui/lib/pki/addon/routes/certificates/index.js +++ b/ui/lib/pki/addon/routes/certificates/index.js @@ -1,7 +1,8 @@ -import Route from '@ember/routing/route'; +import PkiOverviewRoute from '../overview'; import { inject as service } from '@ember/service'; +import { hash } from 'rsvp'; -export default class PkiCertificatesIndexRoute extends Route { +export default class PkiCertificatesIndexRoute extends PkiOverviewRoute { @service store; @service secretMountPath; @service pathHelp; @@ -11,18 +12,23 @@ export default class PkiCertificatesIndexRoute extends Route { return this.pathHelp.getNewModel('pki/certificate', this.secretMountPath.currentPath); } + async fetchCertificates() { + try { + return await this.store.query('pki/certificate', { backend: this.secretMountPath.currentPath }); + } catch (e) { + if (e.httpStatus === 404) { + return { parentModel: this.modelFor('certificates') }; + } else { + throw e; + } + } + } + model() { - return this.store - .query('pki/certificate', { backend: this.secretMountPath.currentPath }) - .then((certificateModel) => { - return { certificateModel, parentModel: this.modelFor('certificates') }; - }) - .catch((err) => { - if (err.httpStatus === 404) { - return { parentModel: this.modelFor('certificates') }; - } else { - throw err; - } - }); + return hash({ + hasConfig: this.hasConfig(), + certificates: this.fetchCertificates(), + parentModel: this.modelFor('certificates'), + }); } } diff --git a/ui/lib/pki/addon/routes/roles/index.js b/ui/lib/pki/addon/routes/roles/index.js index abb5a61769..39d4724483 100644 --- a/ui/lib/pki/addon/routes/roles/index.js +++ b/ui/lib/pki/addon/routes/roles/index.js @@ -1,7 +1,8 @@ -import Route from '@ember/routing/route'; +import PkiOverviewRoute from '../overview'; import { inject as service } from '@ember/service'; +import { hash } from 'rsvp'; -export default class PkiRolesIndexRoute extends Route { +export default class PkiRolesIndexRoute extends PkiOverviewRoute { @service store; @service secretMountPath; @service pathHelp; @@ -12,18 +13,23 @@ export default class PkiRolesIndexRoute extends Route { return this.pathHelp.getNewModel('pki/role', this.secretMountPath.currentPath); } + async fetchRoles() { + try { + return await this.store.query('pki/role', { backend: this.secretMountPath.currentPath }); + } catch (e) { + if (e.httpStatus === 404) { + return { parentModel: this.modelFor('roles') }; + } else { + throw e; + } + } + } + model() { - return this.store - .query('pki/role', { backend: this.secretMountPath.currentPath }) - .then((roleModel) => { - return { roleModel, parentModel: this.modelFor('roles') }; - }) - .catch((err) => { - if (err.httpStatus === 404) { - return { parentModel: this.modelFor('roles') }; - } else { - throw err; - } - }); + return hash({ + hasConfig: this.hasConfig(), + roles: this.fetchRoles(), + parentModel: this.modelFor('roles'), + }); } } diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs index 4e5a17bfee..698a4eb182 100644 --- a/ui/lib/pki/addon/templates/certificates/index.hbs +++ b/ui/lib/pki/addon/templates/certificates/index.hbs @@ -10,14 +10,15 @@ /> {{outlet}} - {{#if this.model.certificateModel.length}} + {{#if this.model.certificates.length}} {{! ARG TODO glimmerize the NavigateInput and refactor so you can use it in an engine }} {{/if}} -{{#if this.model.certificateModel.length}} - {{#each this.model.certificateModel as |pkiCertificate|}} + +{{#if this.model.hasConfig}} + {{#each this.model.certificates as |pkiCertificate|}} - {{! ARG TODO if configuration of engine not setup then direct toward setting that up otherwise replace with new design language }} + 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 25d18cf6ab..88d4c5790f 100644 --- a/ui/lib/pki/addon/templates/roles/index.hbs +++ b/ui/lib/pki/addon/templates/roles/index.hbs @@ -16,50 +16,58 @@ -{{#if this.model.roleModel.length}} - {{#each this.model.roleModel as |pkiRole|}} - -
-
-
- - - {{pkiRole.id}} - +{{#if this.model.hasConfig}} + {{#if this.model.roles.length}} + {{#each this.model.roles as |pkiRole|}} + +
+
+
+ + + {{pkiRole.id}} + +
+
+
+
+ + + +
-
-
- - - -
+ + {{/each}} + {{else}} + +
+

When created, roles will be listed here. Create a role to start generating certificates.

+
+ + Create role +
- - {{/each}} + + {{/if}} {{else}} - -
-

When created, roles will be listed here. Create a role to start generating certificates.

-
- - Create role - -
-
+ + + Configure PKI + {{/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 6ae9d11bc8..a02fa42f97 100644 --- a/ui/tests/acceptance/pki/pki-engine-workflow-test.js +++ b/ui/tests/acceptance/pki/pki-engine-workflow-test.js @@ -64,7 +64,7 @@ module('Acceptance | pki workflow', function (hooks) { }); test('empty state messages are correct when PKI not configured', async function (assert) { - assert.expect(10); + assert.expect(17); const assertEmptyState = (assert, resource) => { assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/${resource}`); assert @@ -73,6 +73,7 @@ module('Acceptance | pki workflow', function (hooks) { 'PKI not configured', `${resource} index renders correct empty state title when PKI not configured` ); + assert.dom(SELECTORS.emptyStateLink).hasText('Configure PKI'); assert .dom(SELECTORS.emptyStateMessage) .hasText( @@ -84,9 +85,8 @@ module('Acceptance | pki workflow', function (hooks) { await visit(`/vault/secrets/${this.mountPath}/pki/overview`); assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`); - // TODO comment in when roles index empty state updated & update assert.expect() number - // await click(SELECTORS.rolesTab); - // assertEmptyState(assert, 'roles'); + await click(SELECTORS.rolesTab); + assertEmptyState(assert, 'roles'); await click(SELECTORS.issuersTab); assertEmptyState(assert, 'issuers'); @@ -109,6 +109,7 @@ module('Acceptance | pki workflow', function (hooks) { allow_subdomains=true \ max_ttl="720h"`, ]); + await runCommands([`write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test"`]); const pki_admin_policy = adminPolicy(this.mountPath, 'roles'); const pki_reader_policy = readerPolicy(this.mountPath, 'roles'); const pki_editor_policy = updatePolicy(this.mountPath, 'roles'); diff --git a/ui/tests/helpers/pki/workflow.js b/ui/tests/helpers/pki/workflow.js index 3799e71cec..e186a32d32 100644 --- a/ui/tests/helpers/pki/workflow.js +++ b/ui/tests/helpers/pki/workflow.js @@ -10,6 +10,7 @@ export const SELECTORS = { pageTitle: '[data-test-pki-role-page-title]', alertBanner: '[data-test-alert-banner="alert"]', emptyStateTitle: '[data-test-empty-state-title]', + emptyStateLink: '.empty-state-actions a', emptyStateMessage: '[data-test-empty-state-message]', // TABS overviewTab: '[data-test-secret-list-tab="Overview"]',