Remove ModelWrap Component

ui/lib/kmip/addon/controllers/credentials/show.js

@@ -0,0 +1,20 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class CredentialsShowController extends Controller {
+ @service flashMessages;
+ @service router;
+
+ @action
+ async revokeCredentials() {
+ try {
+ await this.model.destroyRecord();
+ this.flashMessages.success('Successfully revoked credentials');
+ this.router.transitionTo('vault.cluster.secrets.backend.kmip.credentials.index', this.scope, this.role);
+ } catch (e) {
+ this.flashMessages.danger(`There was an error revoking credentials: ${e.errors.join(' ')}`);
+ this.model.rollbackAttributes();
+ }
+ }
+}

ui/lib/kmip/addon/controllers/role.js

@@ -0,0 +1,21 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class RoleController extends Controller {
+ @service flashMessages;
+ @service router;
+
+ @action
+ async deleteRole() {
+ const { id } = this.model;
+ try {
+ await this.model.destroyRecord();
+ this.flashMessages.success(`Successfully deleted role ${id}`);
+ this.router.transitionTo('vault.cluster.secrets.backend.kmip.scope.roles', this.scope);
+ } catch (e) {
+ this.flashMessages.danger(`There was an error deleting the role ${id}: ${e.errors.join(' ')}`);
+ this.model.rollbackAttributes();
+ }
+ }
+}

ui/lib/kmip/addon/templates/credentials/show.hbs

@@ -11,27 +11,16 @@
 <Toolbar>
  <ToolbarActions>
  {{#if this.model.deletePath.canDelete}}
- <ModelWrap as |m|>
- <ConfirmAction
- @buttonClasses="toolbar-link"
- @onConfirmAction={{action
- (perform
- m.callMethod
- "destroyRecord"
- this.model
- "Successfully revoked credentials"
- "There was an error revoking credentials"
- (transition-to "vault.cluster.secrets.backend.kmip.credentials.index" this.scope this.role)
- )
- }}
- @confirmTitle="Revoke this?"
- @confirmMessage="Any client using these credentials will no longer be able to."
- @cancelButtonText="Cancel"
- @confirmButtonText="Revoke"
- >
- Revoke credentials
- </ConfirmAction>
- </ModelWrap>
+ <ConfirmAction
+ @buttonClasses="toolbar-link"
+ @onConfirmAction={{this.revokeCredentials}}
+ @confirmTitle="Revoke this?"
+ @confirmMessage="Any client using these credentials will no longer be able to."
+ @cancelButtonText="Cancel"
+ @confirmButtonText="Revoke"
+ >
+ Revoke credentials
+ </ConfirmAction>
  <div class="toolbar-separator"></div>
  {{/if}}
  <ToolbarLink @params={{array "credentials.index" this.scope this.role}} data-test-kmip-link-back-to-role>

ui/lib/kmip/addon/templates/role.hbs

@@ -2,25 +2,14 @@
 <Toolbar>
  <ToolbarActions>
  {{#if this.model.updatePath.canUpdate}}
- <ModelWrap as |m|>
- <ConfirmAction
- @buttonClasses="toolbar-link"
- @onConfirmAction={{action
- (perform
- m.callMethod
- "destroyRecord"
- this.model
- (concat "Successfully deleted role " this.model.id)
- (concat "There was an error deleting the role " this.model.id)
- (transition-to "vault.cluster.secrets.backend.kmip.scope.roles" this.scope)
- )
- }}
- @confirmMessage={{concat "Are you sure you want to delete " this.model.id "?"}}
- @cancelButtonText="Cancel"
- >
- Delete role
- </ConfirmAction>
- </ModelWrap>
+ <ConfirmAction
+ @buttonClasses="toolbar-link"
+ @onConfirmAction={{this.deleteRole}}
+ @confirmMessage={{concat "Are you sure you want to delete " this.model.id "?"}}
+ @cancelButtonText="Cancel"
+ >
+ Delete role
+ </ConfirmAction>
  <div class="toolbar-separator"></div>
  {{/if}}
  {{#if this.model.updatePath.canUpdate}}

ui/tests/acceptance/enterprise-kmip-test.js

@@ -1,5 +1,5 @@
 import { currentURL, currentRouteName, settled, fillIn } from '@ember/test-helpers';
-import { module, test, skip } from 'qunit';
+import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
 
@@ -126,8 +126,8 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
  );
  assert.notOk(scopesPage.isEmpty, 'configuration page no longer renders empty state');
  });
- // JLR TODO: figure out concurrency issue after 3.28 upgrade
- skip('it can revoke from the credentials show page', async function (assert) {
+
+ test('it can revoke from the credentials show page', async function (assert) {
  let { path, scope, role, serial } = await generateCreds();
  await settled();
  await credentialsPage.visitDetail({ backend: path, scope, role, serial });
@@ -235,8 +235,8 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
  assert.equal(rolesPage.listItemLinks.length, 0, 'renders no roles');
  assert.ok(rolesPage.isEmpty, 'renders empty');
  });
- // JLR TODO: figure out concurrency issue after 3.28 upgrade
- skip('it can delete a role from the detail page', async function (assert) {
+
+ test('it can delete a role from the detail page', async function (assert) {
  let { path, scope, role } = await createRole();
  await settled();
  await rolesPage.visitDetail({ backend: path, scope, role });