status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 2019-08-02 13:51:08 +02:00 committed by John Cowen
parent 3a0d0833fc
commit e636a72ffd
6 changed files with 123 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-v2/app/routes/dc/kv/edit.js
View File

@ -17,6 +17,7 @@ export default Route.extend(WithKvActions, {
isLoading: false,
parent: repo.findBySlug(ascend(key, 1) || '/', dc),
item: repo.findBySlug(key, dc),
session: null,
}).then(model => {
// TODO: Consider loading this after initial page load
const session = get(model.item, 'Session');

24
ui-v2/app/templates/dc/kv/edit.hbs
View File

@ -5,17 +5,17 @@
{{#block-slot 'breadcrumbs'}}
<ol>
<li><a data-test-back href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
{{#if (not-eq parent.Key '/') }}
{{#each (slice 0 -1 (split parent.Key '/')) as |breadcrumb index|}}
{{#if (not-eq parent.Key '/')}}
{{#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>
{{/each}}
{{/each}}
{{/if}}
</ol>
{{/block-slot}}
{{#block-slot 'header'}}
<h1>
{{#if item.Key }}
{{left-trim item.Key parent.Key }}
{{#if item.Key}}
{{left-trim item.Key parent.Key}}
{{else}}
New Key / Value
{{/if}}
@ -23,18 +23,22 @@
{{/block-slot}}
{{#block-slot 'content'}}
{{#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">
<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>
{{/if}}
{{partial 'dc/kv/form'}}
{{#if session}}
<div data-test-session>
<h2><a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html#session-design" rel="help noopener noreferrer" target="_blank">Lock Session</a></h2>
<div data-test-session={{session.ID}}>
<h2>
<a href="{{env 'CONSUL_DOCUMENTATION_URL'}}/internals/sessions.html#session-design" rel="help noopener noreferrer" target="_blank">Lock Session</a>
</h2>
<dl>
<dt>Name</dt>
<dd>{{session.Name}}</dd>
<dt>Agent</dt>
<dd>
<a href={{href-to 'dc.nodes.show' session.Node }}>{{session.Node}}</a>
<a href={{href-to 'dc.nodes.show' session.Node}}>{{session.Node}}</a>
</dd>
<dt>ID</dt>
<dd>{{session.ID}}</dd>
@ -57,7 +61,7 @@
</dl>
{{#confirmation-dialog message='Are you sure you want to invalidate this session?'}}
{{#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 'dialog' as |execute cancel message|}}
<p>

27
ui-v2/tests/acceptance/dc/kvs/edit.feature Normal file
View File

@ -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

10
ui-v2/tests/acceptance/steps/dc/kvs/edit-steps.js Normal file
View File

@ -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);
});
}

2
ui-v2/tests/pages.js
View File

@ -63,7 +63,7 @@ export default {
nodes: create(nodes(visitable, clickable, attribute, collection, catalogFilter)),
node: create(node(visitable, deletable, clickable, attribute, collection, radiogroup)),
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)),
acl: create(acl(visitable, submitable, deletable, cancelable, clickable)),
policies: create(

18
ui-v2/tests/pages/dc/kv/edit.js
View File

@ -1,7 +1,5 @@
export default function(visitable, submitable, deletable, cancelable) {
return submitable(
cancelable(
deletable({
export default function(visitable, attribute, submitable, deletable, cancelable) {
return {
visit: visitable(['/:dc/kv/:kv/edit', '/:dc/kv/create'], function(str) {
// this will encode the parts of the key path but means you can no longer
// visit with path parts containing slashes
@ -10,8 +8,12 @@ export default function(visitable, submitable, deletable, cancelable) {
.map(encodeURIComponent)
.join('/');
}),
session: deletable({}, '[data-test-session]'),
})
)
);
...submitable(),
...cancelable(),
...deletable(),
session: {
ID: attribute('data-test-session', '[data-test-session]'),
...deletable({}, '[data-test-session]'),
},
};
}