From b7591880dd56cedf0eee356cd24a984fcfc90d37 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Thu, 24 Apr 2014 14:02:26 -0400 Subject: [PATCH] ui: tags, service fixture changes --- ui/index.html | 3 +++ ui/javascripts/fixtures.js | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ui/index.html b/ui/index.html index ce38767ff7..86e8afcacd 100644 --- a/ui/index.html +++ b/ui/index.html @@ -86,6 +86,9 @@ {{#if model}}

{{ model.1.ServiceName }}


+
Tags
+

Pending...

+
Nodes
{{#each node in model }} diff --git a/ui/javascripts/fixtures.js b/ui/javascripts/fixtures.js index aadd069532..afd10969ef 100644 --- a/ui/javascripts/fixtures.js +++ b/ui/javascripts/fixtures.js @@ -8,6 +8,10 @@ window.fixtures = {} +// +// The array route, i.e /ui/services, should return _all_ services +// in the DC +// fixtures.services = [ { "Name": "vagrant-cloud-http", @@ -53,12 +57,17 @@ fixtures.services = [ }, ] -// This is both of the fixture services full response. We -// would just expect one of these, inside of the top level -// key. We require that key just for the fixture lookup. +// +// This one is slightly more complicated to allow more UI interaction. +// It represents the route /ui/services/ BUT it's what is +// BELOW the top-level key. +// +// So, what is actually returned should be similar to the /catalog/service/ +// endpoint. fixtures.services_full = { - "vagrant-cloud-http": [ - // A node + "vagrant-cloud-http": + // This array is what is actually expected from the API. + [ { "ServicePort": 80, "ServiceTags": null,