+{{#let (hash
+ statuses=(if status (split status ',') undefined)
+ sources=(if source (split source ',') undefined)
+ searchproperties=(if (not-eq searchproperty undefined)
+ (split searchproperty ',')
+ searchProperties
+ )
+) as |filters|}}
+ {{#let (or sortBy "Status:asc") as |sort|}}
+ {{#let item.Services as |items|}}
+
{{#if (gt items.length 0) }}
-
- {{/if}}
-
-
-
-
-
+ @searchproperties={{searchProperties}}
+
+ @sort={{sort}}
+ @onsort={{action (mut sortBy) value="target.selected"}}
+
+ @filter={{filters}}
+ @onfilter={{hash
+ searchproperty=(action (mut searchproperty) value="target.selectedItems")
+ status=(action (mut status) value="target.selectedItems")
+ source=(action (mut source) value="target.selectedItems")
+ }}
+ />
+ {{/if}}
+ {{! filter out any sidecar proxies }}
+
+
+
+
+
@@ -21,8 +53,10 @@
-
-
+
+
+ {{/let}}
+ {{/let}}
{{/let}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
index b786066d7..e66d998a3 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
@@ -5,7 +5,7 @@
sources=(if source (split source ',') undefined)
searchproperties=(if (not-eq searchproperty undefined)
(split searchproperty ',')
- (array 'Name' 'Tags' 'ID' 'Address' 'Port' 'Service.Meta' 'Node.Meta')
+ searchProperties
)
) as |filters|}}
{{#let (or sortBy "Status:asc") as |sort|}}
@@ -15,6 +15,7 @@
@sources={{externalSources}}
@search={{search}}
@onsearch={{action (mut search) value="target.value"}}
+ @searchproperties={{searchProperties}}
@sort={{sort}}
@onsort={{action (mut sortBy) value="target.selected"}}
@@ -27,6 +28,7 @@
}}
/>
{{/if}}
+ {{! Service > Service Instance view doesn't require filtering of proxies }}
- Object.assign({}, item, {
- Datacenter: dc,
- // TODO: default isn't required here, once we've
- // refactored out our Serializer this can go
- Namespace: nspace,
- uid: `["${nspace}","${dc}","${item.ID}"]`,
- })
- );
const actual = serializer.respondForQuery(
function(cb) {
const headers = {};
@@ -33,13 +27,22 @@ module('Integration | Serializer | node', function(hooks) {
},
{
dc: dc,
- }
+ },
+ {
+ dc: dc,
+ },
+ modelClass
);
- assert.deepEqual(actual, expected);
+ assert.equal(actual[0].Datacenter, dc);
+ assert.equal(actual[0].Namespace, nspace);
+ assert.equal(actual[0].uid, `["${nspace}","${dc}","${actual[0].ID}"]`);
});
});
test('respondForQueryRecord returns the correct data for item endpoint', function(assert) {
+ const store = this.owner.lookup('service:store');
const serializer = this.owner.lookup('serializer:node');
+ serializer.store = store;
+ const modelClass = store.modelFor('node');
const dc = 'dc-1';
const id = 'node-name';
const request = {
@@ -65,9 +68,15 @@ module('Integration | Serializer | node', function(hooks) {
},
{
dc: dc,
- }
+ },
+ {
+ dc: dc,
+ },
+ modelClass
);
- assert.deepEqual(actual, expected);
+ assert.equal(actual.Datacenter, dc);
+ assert.equal(actual.Namespace, nspace);
+ assert.equal(actual.uid, `["${nspace}","${dc}","${actual.ID}"]`);
});
});
test('respondForQueryLeader returns the correct data', function(assert) {