scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 02:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated show lease with toggle ttl picker (#11256)

Browse Source 
* Updated show lease with toggle ttl picker

For lease renewal, pass increment param instead of interval

* Fixed formatting

* Added changelog
This commit is contained in:
Arnav Palnitkar
2021-04-02 13:23:56 -07:00
committed by GitHub
parent 8cdcd5c8d2
commit 2eace988cc
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/11256.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
ui: Fixed and updated lease renewal picker
```

4
ui/app/adapters/lease.js
View File

@@ -14,12 +14,12 @@ export default ApplicationAdapter.extend({
return this.ajax(url, 'PUT'); return this.ajax(url, 'PUT');
}, },
renew(lease_id, interval) { renew(lease_id, increment) {
let url = this.buildURL() + '/leases/renew'; let url = this.buildURL() + '/leases/renew';
return this.ajax(url, 'PUT', { return this.ajax(url, 'PUT', {
data: { data: {
lease_id, lease_id,
interval, increment,
}, },
}); });
}, },

4
ui/app/controllers/vault/cluster/access/leases/show.js
View File

@@ -24,11 +24,11 @@ export default Controller.extend({
}); });
}, },
renewLease(model, interval) { renewLease(model, increment) {
const adapter = model.store.adapterFor('lease'); const adapter = model.store.adapterFor('lease');
const flash = this.flashMessages; const flash = this.flashMessages;
adapter adapter
.renew(model.id, interval) .renew(model.id, increment?.seconds)
.then(() => { .then(() => {
this.send('refreshModel'); this.send('refreshModel');
// lol this is terrible, but there's no way to get the promise from the route refresh // lol this is terrible, but there's no way to get the promise from the route refresh

14
ui/app/templates/vault/cluster/access/leases/show.hbs
View File

@@ -52,16 +52,22 @@
{{model.expireTime}} {{model.expireTime}}
</code> </code>
</InfoTableRow> </InfoTableRow>
<InfoTableRow @label="Expires in" @value={{date-from-now model.expireTime interval=1000 hideSuffix=true}} /> <InfoTableRow @label="Expires in" @value={{date-from-now model.expireTime increment=1000 hideSuffix=true}} />
{{/if}} {{/if}}
<InfoTableRow @label="TTL" @value={{model.ttl}} /> <InfoTableRow @label="TTL" @value={{model.ttl}} />
</div> </div>
{{#if (and (not model.isAuthLease) model.renewable capabilities.renew.canUpdate)}} {{#if (and (not model.isAuthLease) model.renewable capabilities.renew.canUpdate)}}
<div class="box is-shadowless" data-test-lease-renew-picker=true> <div class="box is-shadowless" data-test-lease-renew-picker=true>
<h2 class="title is-6">Renew Lease</h2> <h2 class="title is-6">Renew Lease</h2>
<form {{action "renewLease" model interval on="submit"}}> <form {{action "renewLease" model increment on="submit"}}>
<TtlPicker @labelText="Interval" @labelClass="is-label" @onChange={{action (mut interval)}} @outputSeconds={{true}} /> <TtlPicker2
<div class="field"> @label="Increment"
@helperTextEnabled="Lease will expire after"
@helperTextDisabled="Vault will use the default lease duration"
@labelClass="is-label"
@onChange={{action (mut increment)}} @unit="s"
/>
<div class="field has-top-margin-s">
<div class="control"> <div class="control">
<button <button
type="submit" type="submit"