ui: [Bugfix] - Sticky KV Sessions (#6166)
Initialize session value to `null` to prevent stickiness from a session the previous KV
This commit is contained in:
John Cowen
John Cowen
parent
834479d56f
commit
ff3c2582e2
|
|
@ -17,6 +17,7 @@ export default Route.extend(WithKvActions, {
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
parent: repo.findBySlug(ascend(key, 1) || '/', dc),
|
parent: repo.findBySlug(ascend(key, 1) || '/', dc),
|
||||||
item: repo.findBySlug(key, dc),
|
item: repo.findBySlug(key, dc),
|
||||||
|
session: null,
|
||||||
}).then(model => {
|
}).then(model => {
|
||||||
// TODO: Consider loading this after initial page load
|
// TODO: Consider loading this after initial page load
|
||||||
const session = get(model.item, 'Session');
|
const session = get(model.item, 'Session');
|
||||||
|
|
|
||||||
|
|
@ -1,73 +1,77 @@
|
||||||
{{#app-view class="kv edit" loading=isLoading}}
|
{{#app-view class="kv edit" loading=isLoading}}
|
||||||
{{#block-slot 'notification' as |status type|}}
|
{{#block-slot 'notification' as |status type|}}
|
||||||
{{partial 'dc/kv/notifications'}}
|
{{partial 'dc/kv/notifications'}}
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{#block-slot 'breadcrumbs'}}
|
{{#block-slot 'breadcrumbs'}}
|
||||||
<ol>
|
<ol>
|
||||||
<li><a data-test-back href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
|
<li><a data-test-back href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
|
||||||
{{#if (not-eq parent.Key '/') }}
|
{{#if (not-eq parent.Key '/')}}
|
||||||
{{#each (slice 0 -1 (split parent.Key '/')) as |breadcrumb index|}}
|
{{#each (slice 0 -1 (split parent.Key '/')) as |breadcrumb index|}}
|
||||||
<li><a href={{href-to 'dc.kv.folder' (join '/' (append (slice 0 (add index 1) (split parent.Key '/')) ''))}}>{{breadcrumb}}</a></li>
|
<li><a href={{href-to 'dc.kv.folder' (join '/' (append (slice 0 (add index 1) (split parent.Key '/')) ''))}}>{{breadcrumb}}</a></li>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</ol>
|
</ol>
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{#block-slot 'header'}}
|
{{#block-slot 'header'}}
|
||||||
<h1>
|
<h1>
|
||||||
{{#if item.Key }}
|
{{#if item.Key}}
|
||||||
{{left-trim item.Key parent.Key }}
|
{{left-trim item.Key parent.Key}}
|
||||||
{{else}}
|
{{else}}
|
||||||
New Key / Value
|
New Key / Value
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</h1>
|
</h1>
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{#block-slot 'content'}}
|
{{#block-slot 'content'}}
|
||||||
{{#if session}}
|
{{#if session}}
|
||||||
<p class="notice warning"><strong>Warning.</strong> This KV has a lock session. You can edit KV's with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it's associated with. See below for more details on the Lock Session and see <a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html" target="_blank" rel="noopener noreferrer">our documentation</a> for more information.</p>
|
<p class="notice warning">
|
||||||
{{/if}}
|
<strong>Warning.</strong> This KV has a lock session. You can edit KV's with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it's associated with. See below for more details on the Lock Session and see <a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html" target="_blank" rel="noopener noreferrer">our documentation</a> for more information.
|
||||||
{{partial 'dc/kv/form'}}
|
</p>
|
||||||
{{#if session}}
|
{{/if}}
|
||||||
<div data-test-session>
|
{{partial 'dc/kv/form'}}
|
||||||
<h2><a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html#session-design" rel="help noopener noreferrer" target="_blank">Lock Session</a></h2>
|
{{#if session}}
|
||||||
<dl>
|
<div data-test-session={{session.ID}}>
|
||||||
<dt>Name</dt>
|
<h2>
|
||||||
<dd>{{session.Name}}</dd>
|
<a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html#session-design" rel="help noopener noreferrer" target="_blank">Lock Session</a>
|
||||||
<dt>Agent</dt>
|
</h2>
|
||||||
<dd>
|
<dl>
|
||||||
<a href={{href-to 'dc.nodes.show' session.Node }}>{{session.Node}}</a>
|
<dt>Name</dt>
|
||||||
</dd>
|
<dd>{{session.Name}}</dd>
|
||||||
<dt>ID</dt>
|
<dt>Agent</dt>
|
||||||
<dd>{{session.ID}}</dd>
|
<dd>
|
||||||
<dt>Behavior</dt>
|
<a href={{href-to 'dc.nodes.show' session.Node}}>{{session.Node}}</a>
|
||||||
<dd>{{session.Behavior}}</dd>
|
</dd>
|
||||||
|
<dt>ID</dt>
|
||||||
|
<dd>{{session.ID}}</dd>
|
||||||
|
<dt>Behavior</dt>
|
||||||
|
<dd>{{session.Behavior}}</dd>
|
||||||
{{#if session.Delay }}
|
{{#if session.Delay }}
|
||||||
<dt>Delay</dt>
|
<dt>Delay</dt>
|
||||||
<dd>{{session.LockDelay}}</dd>
|
<dd>{{session.LockDelay}}</dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{#if session.TTL }}
|
{{#if session.TTL }}
|
||||||
<dt>TTL</dt>
|
<dt>TTL</dt>
|
||||||
<dd>{{session.TTL}}</dd>
|
<dd>{{session.TTL}}</dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{#if (gt session.Checks.length 0)}}
|
{{#if (gt session.Checks.length 0)}}
|
||||||
<dt>Health Checks</dt>
|
<dt>Health Checks</dt>
|
||||||
<dd>
|
<dd>
|
||||||
{{ join ', ' session.Checks}}
|
{{ join ', ' session.Checks}}
|
||||||
</dd>
|
</dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</dl>
|
</dl>
|
||||||
{{#confirmation-dialog message='Are you sure you want to invalidate this session?'}}
|
{{#confirmation-dialog message='Are you sure you want to invalidate this session?'}}
|
||||||
{{#block-slot 'action' as |confirm|}}
|
{{#block-slot 'action' as |confirm|}}
|
||||||
<button type="button" data-test-delete class="type-delete" {{ action confirm "invalidateSession" session }}>Invalidate Session</button>
|
<button type="button" data-test-delete class="type-delete" {{action confirm "invalidateSession" session}}>Invalidate Session</button>
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{#block-slot 'dialog' as |execute cancel message|}}
|
{{#block-slot 'dialog' as |execute cancel message|}}
|
||||||
<p>
|
<p>
|
||||||
{{message}}
|
{{message}}
|
||||||
</p>
|
</p>
|
||||||
<button type="button" class="type-delete" {{action execute}}>Confirm Invalidation</button>
|
<button type="button" class="type-delete" {{action execute}}>Confirm Invalidation</button>
|
||||||
<button type="button" class="type-cancel" {{action cancel}}>Cancel</button>
|
<button type="button" class="type-cancel" {{action cancel}}>Cancel</button>
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{/confirmation-dialog}}
|
{{/confirmation-dialog}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/block-slot}}
|
{{/block-slot}}
|
||||||
{{/app-view}}
|
{{/app-view}}
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
@setupApplicationTest
|
||||||
|
Feature: dc / kvs / edit: KV Viewing
|
||||||
|
Scenario:
|
||||||
|
Given 1 datacenter model with the value "datacenter"
|
||||||
|
And 1 kv model from yaml
|
||||||
|
---
|
||||||
|
Key: key
|
||||||
|
Session: session-id
|
||||||
|
---
|
||||||
|
When I visit the kv page for yaml
|
||||||
|
---
|
||||||
|
dc: datacenter
|
||||||
|
kv: key
|
||||||
|
---
|
||||||
|
Then the url should be /datacenter/kv/key/edit
|
||||||
|
And I see ID on the session like "session-id"
|
||||||
|
Given 1 kv model from yaml
|
||||||
|
---
|
||||||
|
Key: another-key
|
||||||
|
Session: ~
|
||||||
|
---
|
||||||
|
When I visit the kv page for yaml
|
||||||
|
---
|
||||||
|
dc: datacenter
|
||||||
|
kv: another-key
|
||||||
|
---
|
||||||
|
Then I don't see ID on the session
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
import steps from '../../steps';
|
||||||
|
|
||||||
|
// step definitions that are shared between features should be moved to the
|
||||||
|
// tests/acceptance/steps/steps.js file
|
||||||
|
|
||||||
|
export default function(assert) {
|
||||||
|
return steps(assert).then('I should find a file', function() {
|
||||||
|
assert.ok(true, this.step);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
@ -63,7 +63,7 @@ export default {
|
||||||
nodes: create(nodes(visitable, clickable, attribute, collection, catalogFilter)),
|
nodes: create(nodes(visitable, clickable, attribute, collection, catalogFilter)),
|
||||||
node: create(node(visitable, deletable, clickable, attribute, collection, radiogroup)),
|
node: create(node(visitable, deletable, clickable, attribute, collection, radiogroup)),
|
||||||
kvs: create(kvs(visitable, deletable, creatable, clickable, attribute, collection)),
|
kvs: create(kvs(visitable, deletable, creatable, clickable, attribute, collection)),
|
||||||
kv: create(kv(visitable, submitable, deletable, cancelable, clickable)),
|
kv: create(kv(visitable, attribute, submitable, deletable, cancelable, clickable)),
|
||||||
acls: create(acls(visitable, deletable, creatable, clickable, attribute, collection, aclFilter)),
|
acls: create(acls(visitable, deletable, creatable, clickable, attribute, collection, aclFilter)),
|
||||||
acl: create(acl(visitable, submitable, deletable, cancelable, clickable)),
|
acl: create(acl(visitable, submitable, deletable, cancelable, clickable)),
|
||||||
policies: create(
|
policies: create(
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,19 @@
|
||||||
export default function(visitable, submitable, deletable, cancelable) {
|
export default function(visitable, attribute, submitable, deletable, cancelable) {
|
||||||
return submitable(
|
return {
|
||||||
cancelable(
|
visit: visitable(['/:dc/kv/:kv/edit', '/:dc/kv/create'], function(str) {
|
||||||
deletable({
|
// this will encode the parts of the key path but means you can no longer
|
||||||
visit: visitable(['/:dc/kv/:kv/edit', '/:dc/kv/create'], function(str) {
|
// visit with path parts containing slashes
|
||||||
// this will encode the parts of the key path but means you can no longer
|
return str
|
||||||
// visit with path parts containing slashes
|
.split('/')
|
||||||
return str
|
.map(encodeURIComponent)
|
||||||
.split('/')
|
.join('/');
|
||||||
.map(encodeURIComponent)
|
}),
|
||||||
.join('/');
|
...submitable(),
|
||||||
}),
|
...cancelable(),
|
||||||
session: deletable({}, '[data-test-session]'),
|
...deletable(),
|
||||||
})
|
session: {
|
||||||
)
|
ID: attribute('data-test-session', '[data-test-session]'),
|
||||||
);
|
...deletable({}, '[data-test-session]'),
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue