luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: refactor kv controllers, finish multi-dc support

This commit is contained in:
Jack Pearkes 2014-05-01 10:00:36 -04:00
parent 1648031339
commit 6f77bc93a4
4 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/index.html
View File

@ -19,7 +19,7 @@
{{outlet}}
</script>
<script type="text/x-handlebars" data-template-name="error">
<script type="text/x-handlebars" data-template-name="errora">
<div class="row">
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
<div class="text-center error">
@ -108,7 +108,7 @@
<div class="col-md-6">
<div class="row">
<div class="panel">
<div {{ bind-attr class=":panel-bar newKey.isValid:bg-green:bg-light-gray" }}></div>
<div {{ bind-attr class=":panel-bar isLoading:bg-orange:bg-light-gray" }}></div>
<div class="panel-heading">
<h3 class="panel-title">
Create Key

19
ui/javascripts/app/controllers.js
View File

@ -80,12 +80,11 @@ App.KvShowController.reopen({
var grandParentKey = this.get('grandParentKey');
var controller = this;
var dc = this.get('dc').get('datacenter');
console.log(dc)
// If we don't have a previous model to base
// on our parent, or we're not at the root level,
// strip the leading slash.
if (parentKey != undefined || parentKey != "/") {
// add the prefix
if (parentKey != undefined && parentKey != "/") {
newKey.set('Key', (parentKey + newKey.get('Key')));
}
@ -95,13 +94,13 @@ App.KvShowController.reopen({
type: 'PUT',
data: newKey.get('Value')
}).then(function(response) {
controller.set('isLoading', false)
// transition to the right place
if (newKey.get('isFolder') == true) {
controller.transitionToRoute('kv.show', newKey.get('urlSafeKey'));
} else {
controller.transitionToRoute('kv.edit', newKey.get('urlSafeKey'));
}
controller.set('isLoading', false)
}).fail(function(response) {
// Render the error message on the form if the request failed
controller.set('errorMessage', 'Received error while processing: ' + response.statusText)
@ -113,19 +112,22 @@ App.KvShowController.reopen({
App.KvEditController = Ember.Controller.extend({
isLoading: false,
needs: ["dc"],
dc: Ember.computed.alias("controllers.dc"),
actions: {
// Updates the key set as the model on the route.
updateKey: function() {
this.set('isLoading', true);
var dc = this.get('dc').get('datacenter');
var key = this.get("model");
var controller = this;
// Put the key and the decoded (plain text) value
// from the form.
Ember.$.ajax({
url: "/v1/kv/" + key.get('Key'),
url: ("/v1/kv/" + key.get('Key') + '?dc=' + dc),
type: 'PUT',
data: key.get('valueDecoded')
}).then(function(response) {
@ -139,21 +141,22 @@ App.KvEditController = Ember.Controller.extend({
deleteKey: function() {
this.set('isLoading', true);
var key = this.get("model");
var controller = this;
var dc = this.get('dc').get('datacenter');
// Get the parent for the transition back up a level
// after the delete
var parent = key.get('urlSafeParentKey');
// Delete the key
Ember.$.ajax({
url: "/v1/kv/" + key.get('Key'),
url: ("/v1/kv/" + key.get('Key') + '?dc=' + dc),
type: 'DELETE'
}).then(function(response) {
controller.set('isLoading', false);
// Tranisiton back up a level
controller.transitionToRoute('kv.show', parent);
controller.set('isLoading', false);
}).fail(function(response) {
// Render the error message on the form if the request failed
controller.set('errorMessage', 'Received error while processing: ' + response.statusText)

4
ui/javascripts/app/router.js
View File

@ -1,6 +1,10 @@
window.App = Ember.Application.create({
rootElement: "#app",
LOG_TRANSITIONS: true,
LOG_STACKTRACE_ON_DEPRECATION: true,
LOG_BINDINGS: true,
LOG_TRANSITIONS: true,
LOG_ACTIVE_GENERATION: true,
// The baseUrl for AJAX requests
// TODO implement in AJAX logic
baseUrl: 'http://localhost:8500'

104
ui/javascripts/app/routes.js
View File

@ -1,9 +1,44 @@
//
//
// Superclass to be used by all of the main routes below. All routes
// but the IndexRoute share the need to have a datacenter set.
//
//
App.BaseRoute = Ember.Route.extend({
getParentAndGrandparent: function(key) {
var parentKey, grandParentKey, isFolder;
parts = key.split('/');
// If we are the root, set the parent and grandparent to the
// root.
if (key == "/") {
parentKey = "/";
grandParentKey ="/"
} else {
// Go one level up
parts.pop();
parentKey = parts.join("/") + "/";
// Go two levels up
parts.pop();
grandParentKey = parts.join("/") + "/";
}
return {grandParent: grandParentKey, parent: parentKey}
},
removeDuplicateKeys: function(keys, matcher) {
// Loop over the keys
keys.forEach(function(item, index) {
if (item.get('Key') == matcher) {
// If we are in a nested folder and the folder
// name matches our position, remove it
keys.splice(index, 1);
}
});
return keys;
},
actions: {
// Used to link to keys that are not objects,
// like parents and grandParents
@ -49,7 +84,7 @@ App.DcRoute = App.BaseRoute.extend({
return Ember.RSVP.hash({
dc: params.dc,
dcs: Ember.$.getJSON('/v1/catalog/datacenters'),
nodes: Ember.$.getJSON('/v1/internal/ui/nodes').then(function(data) {
nodes: Ember.$.getJSON('/v1/internal/ui/nodes?dc=' + params.dc).then(function(data) {
objs = [];
// Merge the nodes into a list and create objects out of them
@ -98,57 +133,30 @@ App.KvShowRoute = App.BaseRoute.extend({
},
setupController: function(controller, models) {
var parentKey = "/";
var grandParentKey = "/";
var key = models.key;
// Loop over the keys
models.keys.forEach(function(item, index) {
if (item.get('Key') == key) {
// Handle having only one key as a sub-parent
parentKey = item.get('Key');
grandParentKey = item.get('parentKey');
// Remove the dupe
models.keys.splice(index, 1);
}
});
var parentKeys = this.getParentAndGrandparent(key);
models.keys = this.removeDuplicateKeys(models.keys, models.key);
controller.set('content', models.keys);
controller.set('parentKey', parentKey);
controller.set('grandParentKey', grandParentKey);
controller.set('parentKey', parentKeys.parent);
controller.set('grandParentKey', parentKeys.grandParent);
controller.set('newKey', App.Key.create());
}
});
App.KvEditRoute = App.BaseRoute.extend({
model: function(params) {
var keyName = params.key.replace(/-/g, "/");
var key = keyName;
var parentKey;
var key = params.key.replace(/-/g, "/");
var dc = this.modelFor('dc').dc;
// Get the parent key
if (key.slice(-1) == "/") {
key = key.substring(0, key.length - 1);
}
parts = key.split('/');
// Go one level up
parts.pop();
// If we are all the way up, just return nothing for the root
if (parts.length == 0) {
parentKey = ""
} else {
// Add a slash
parentKey = parts.join("/") + "/";
}
var parentKeys = this.getParentAndGrandparent(key)
// Return a promise hash to get the data for both columns
return Ember.RSVP.hash({
key: Ember.$.getJSON('/v1/kv/' + keyName).then(function(data) {
key: Ember.$.getJSON('/v1/kv/' + key + '?dc=' + dc).then(function(data) {
// Convert the returned data to a Key
return App.Key.create().setProperties(data[0]);
}),
keys: keysPromise = Ember.$.getJSON('/v1/kv/' + parentKey + '?keys&seperator=' + '/' + '&dc=' + dc).then(function(data) {
keys: keysPromise = Ember.$.getJSON('/v1/kv/' + parentKeys.parent + '?keys&seperator=' + '/' + '&dc=' + dc).then(function(data) {
objs = [];
data.map(function(obj){
objs.push(App.Key.create({Key: obj}));
@ -159,23 +167,13 @@ App.KvEditRoute = App.BaseRoute.extend({
},
setupController: function(controller, models) {
var key = models.key;
var parentKeys = this.getParentAndGrandparent(key.get('Key'));
models.keys = this.removeDuplicateKeys(models.keys, parentKeys.parent);
controller.set('content', models.key);
var parentKey = "/";
var grandParentKey = "/";
// Loop over the keys
models.keys.forEach(function(item, index) {
if (item.get('Key') == models.key.get('parentKey')) {
parentKey = item.get('Key');
grandParentKey = item.get('parentKey');
// Remove the dupe
models.keys.splice(index, 1);
}
});
controller.set('parentKey', parentKey);
controller.set('grandParentKey', grandParentKey);
controller.set('parentKey', parentKeys.parent);
controller.set('grandParentKey', parentKeys.grandParent);
controller.set('siblings', models.keys);
}
});