address transit capabilities issues

hashicorp · Oct 2, 2024 · fa0894e · fa0894e
1 parent be3a183
commit fa0894e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/ui/app/models/transit-key.js b/ui/app/models/transit-key.js
@@ -181,6 +181,9 @@ export default class TransitKeyModel extends Model {
   get canRead() {
     return this.secretPath.get('canUpdate') !== false;
   }
+  get canUpdate() {
+    return this.secretPath.get('canUpdate') !== false;
+  }
   get canEdit() {
     return this.secretPath.get('canUpdate') !== false;
   }

diff --git a/ui/app/templates/components/transit-edit.hbs b/ui/app/templates/components/transit-edit.hbs
@@ -40,14 +40,12 @@
     @deleteKey={{action "deleteKey"}}
     @key={{this.key}}
     @requestInFlight={{this.requestInFlight}}
-    @capabilities={{this.capabilities}}
   />
 {{else if (eq this.mode "show")}}
   <TransitFormShow
     @refresh={{action "refresh"}}
     @tab={{this.tab}}
     @key={{this.key}}
-    @capabilities={{this.capabilities}}
     @mode={{this.mode}}
     @model={{this.model}}
     @backend={{this.backend}}

diff --git a/ui/app/templates/components/transit-form-edit.hbs b/ui/app/templates/components/transit-form-edit.hbs
@@ -89,7 +89,7 @@
   </div>
   <div class="field is-grouped is-grouped-split box is-fullwidth is-bottomless">
     <div class="field is-grouped">
-      {{#if @capabilities.canUpdate}}
+      {{#if @key.canUpdate}}
         <div class="control">
           <Hds::Button
             @text="Update transit key"
@@ -109,7 +109,7 @@
         />
       </div>
     </div>
-    {{#if (and @key.canDelete @capabilities.canDelete)}}
+    {{#if @model.canDelete}}
       <ConfirmAction @buttonText="Delete transit key" @onConfirmAction={{@deleteKey}} />
     {{/if}}
   </div>

diff --git a/ui/app/templates/components/transit-form-show.hbs b/ui/app/templates/components/transit-form-show.hbs
@@ -63,7 +63,7 @@
         />
       {{/if}}
       {{#if (eq @mode "show")}}
-        {{#if (or @capabilities.canUpdate @capabilities.canDelete)}}
+        {{#if (or @model.canUpdate @model.canDelete)}}
           <ToolbarSecretLink @secret={{@key.id}} @backend={{@key.backend}} @mode="edit" replace={{true}}>
             Edit key
           </ToolbarSecretLink>

diff --git a/ui/tests/integration/components/transit-edit-test.js b/ui/tests/integration/components/transit-edit-test.js
@@ -7,6 +7,8 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'vault/tests/helpers';
 import { click, fillIn, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { capabilitiesStub } from 'vault/tests/helpers/stubs';
 
 const SELECTORS = {
   createForm: '[data-test-transit-create-form]',
@@ -16,9 +18,13 @@ const SELECTORS = {
 };
 module('Integration | Component | transit-edit', function (hooks) {
   setupRenderingTest(hooks);
+  setupMirage(hooks);
 
   hooks.beforeEach(function () {
     this.store = this.owner.lookup('service:store');
+    this.server.post('/sys/capabilities-self', () =>
+      capabilitiesStub('transit-backend/keys/some-key', ['sudo'])
+    );
     this.model = this.store.createRecord('transit-key', { backend: 'transit-backend', id: 'some-key' });
     this.backendCrumb = {
       label: 'transit',