ui: list sessions on the nodes and allow invalidation

This commit is contained in:
Jack Pearkes 2014-06-06 15:11:26 -04:00
parent 23cc6a3a5e
commit 6cdd068c55
6 changed files with 73 additions and 6 deletions

View File

@ -327,7 +327,7 @@
<hr> <hr>
</div> </div>
<div class="col-md-6 col-lg-7 border-left"> <div class="col-md-6 col-lg-7 border-left scrollable">
<div class="row padded-border"> <div class="row padded-border">
{{outlet}} {{outlet}}
</div> </div>
@ -429,7 +429,7 @@
<div class="border-left hidden-xs hidden-sm"> <div class="border-left hidden-xs hidden-sm">
</div> </div>
<div class="col-md-6 col-lg-7 border-left"> <div class="col-md-6 col-lg-7 border-left scrollable">
<div class="row padded-border"> <div class="row padded-border">
{{outlet}} {{outlet}}
</div> </div>
@ -445,7 +445,6 @@
<h3 class="no-margin">{{ model.Node }} <small> {{ model.Address }}</small></h3> <h3 class="no-margin">{{ model.Node }} <small> {{ model.Address }}</small></h3>
<hr> <hr>
{{foobar}}
<h5>Service Tags</h5> <h5>Service Tags</h5>
{{#if model.nodeTags}} {{#if model.nodeTags}}
@ -492,6 +491,25 @@
</div> </div>
{{/each}} {{/each}}
<h5>Lock Sessions</h5>
{{#if sessions }}
{{errorMessage}}
{{#each session in sessions }}
<div class="list-group-item list-condensed">
<div class="bg-light-gray list-bar-horizontal"></div>
<div class="name">
{{session.ID}}
<button {{ action "invalidateSession" session.ID }} {{ bind-attr class=":btn :btn-danger :pull-right :btn-list isLoading:btn-warning" }}>Invalidate</button>
</div>
</div>
{{/each}}
{{else}}
<p class="light small">No sessions</p>
{{/if}}
</script> </script>
<script type="text/x-handlebars" id="index"> <script type="text/x-handlebars" id="index">

View File

@ -161,11 +161,12 @@ App.KvShowController.reopen({
this.set('isLoading', true); this.set('isLoading', true);
var controller = this; var controller = this;
var dc = controller.get('dc').get('datacenter');
var grandParent = controller.get('grandParentKey'); var grandParent = controller.get('grandParentKey');
// Delete the folder // Delete the folder
Ember.$.ajax({ Ember.$.ajax({
url: ("/v1/kv/" + controller.get('parentKey') + '?recurse'), url: ("/v1/kv/" + controller.get('parentKey') + '?recurse&dc=' + dc),
type: 'DELETE' type: 'DELETE'
}).then(function(response) { }).then(function(response) {
controller.transitionToNearestParent(grandParent); controller.transitionToNearestParent(grandParent);
@ -277,6 +278,35 @@ ItemBaseController = Ember.ArrayController.extend({
} }
}); });
App.NodesShowController = Ember.ObjectController.extend({
needs: ["dc"],
dc: Ember.computed.alias("controllers.dc"),
actions: {
invalidateSession: function(sessionId) {
this.set('isLoading', true);
var controller = this;
var node = controller.get('model');
var dc = controller.get('dc').get('datacenter');
if (window.confirm("Are you sure you want to invalidate this session?")) {
// Delete the session
Ember.$.ajax({
url: ("/v1/session/destroy/" + sessionId + '?dc=' + dc),
type: 'PUT'
}).then(function(response) {
return Ember.$.getJSON('/v1/session/node/' + node.Node + '?dc=' + dc).then(function(data) {
controller.set('sessions', data)
});
}).fail(function(response) {
// Render the error message on the form if the request failed
controller.set('errorMessage', 'Received error while processing: ' + response.statusText)
});
}
}
}
});
App.NodesController = ItemBaseController.extend({ App.NodesController = ItemBaseController.extend({
items: Ember.computed.alias("nodes"), items: Ember.computed.alias("nodes"),
}); });

View File

@ -241,6 +241,7 @@ App.NodesShowRoute = App.BaseRoute.extend({
var dc = this.modelFor('dc').dc var dc = this.modelFor('dc').dc
// Return a promise hash of the node and nodes // Return a promise hash of the node and nodes
return Ember.RSVP.hash({ return Ember.RSVP.hash({
dc: dc,
node: Ember.$.getJSON('/v1/internal/ui/node/' + params.name + '?dc=' + dc).then(function(data) { node: Ember.$.getJSON('/v1/internal/ui/node/' + params.name + '?dc=' + dc).then(function(data) {
return App.Node.create(data) return App.Node.create(data)
}), }),
@ -250,8 +251,17 @@ App.NodesShowRoute = App.BaseRoute.extend({
}); });
}, },
// Load the sessions for the node
afterModel: function(models) {
return Ember.$.getJSON('/v1/session/node/' + models.node.Node + '?dc=' + models.dc).then(function(data) {
models.sessions = data
return models
});
},
setupController: function(controller, models) { setupController: function(controller, models) {
controller.set('content', models.node); controller.set('content', models.node);
controller.set('sessions', models.sessions);
// //
// Since we have 2 column layout, we need to also display the // Since we have 2 column layout, we need to also display the
// list of nodes on the left. Hence setting the attribute // list of nodes on the left. Hence setting the attribute

View File

@ -81,4 +81,11 @@
padding: 8px; padding: 8px;
} }
&.btn-list {
font-size: 10px;
padding: 3px 5px 3px 5px;
margin-right: 5px;
border-radius: 3px;
}
} }

View File

@ -45,7 +45,7 @@
background-color: lighten($gray-background, 8%); background-color: lighten($gray-background, 8%);
} }
&.list-condensed-link { &.list-condensed-link, &.list-condensed {
border-color: $gray-background; border-color: $gray-background;
margin-bottom: 4px; margin-bottom: 4px;
margin-top: 4px; margin-top: 4px;
@ -55,7 +55,7 @@
.name { .name {
font-size: 15px; font-size: 15px;
padding-top: 7px; padding-top: 6px;
small { small {
padding-right: 8px; padding-right: 8px;

View File

@ -107,6 +107,7 @@ a {
.ember-list-view { .ember-list-view {
overflow: auto; overflow: auto;
position: relative; position: relative;
margin-bottom: 30px;
} }
.ember-list-item-view { .ember-list-item-view {
@ -117,4 +118,5 @@ a {
.scrollable { .scrollable {
overflow: auto; overflow: auto;
height: 800px; height: 800px;
margin-bottom: 30px;
} }