- There are no services.
+ This node has no service instances{{#if (gt items.length 0)}} matching that search{{/if}}.
diff --git a/ui/packages/consul-ui/tests/acceptance/page-navigation.feature b/ui/packages/consul-ui/tests/acceptance/page-navigation.feature
index 614d841a1..eef74e1da 100644
--- a/ui/packages/consul-ui/tests/acceptance/page-navigation.feature
+++ b/ui/packages/consul-ui/tests/acceptance/page-navigation.feature
@@ -23,7 +23,7 @@ Feature: page-navigation
Where:
-------------------------------------------------------------------------------------
| Link | URL | Endpoint |
- | nodes | /dc-1/nodes | /v1/internal/ui/nodes?dc=dc-1 |
+ | nodes | /dc-1/nodes | /v1/internal/ui/nodes?dc=dc-1&ns=@namespace |
| kvs | /dc-1/kv | /v1/kv/?keys&dc=dc-1&separator=%2F&ns=@namespace |
| acls | /dc-1/acls/tokens | /v1/acl/tokens?dc=dc-1&ns=@namespace |
# | settings | /settings | /v1/catalog/datacenters |
@@ -39,11 +39,10 @@ Feature: page-navigation
And I click "[data-test-back]"
Then the url should be [Back]
Where:
- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- | Item | Model | URL | Endpoint | Back |
- | kv | kvs | /dc-1/kv/0-key-value/edit | /v1/session/info/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=dc-1&ns=@namespace | /dc-1/kv |
- # | acl | acls | /dc-1/acls/anonymous | /v1/acl/info/anonymous?dc=dc-1 | /dc-1/acls |
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ -------------------------------------------------------------------------------------------------------------------------------------
+ | Item | Model | URL | Endpoint | Back |
+ | kv | kvs | /dc-1/kv/0-key-value/edit | /v1/session/info/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=dc-1&ns=@namespace | /dc-1/kv |
+ -------------------------------------------------------------------------------------------------------------------------------------
Scenario: The node detail page calls the correct API endpoints
When I visit the node page for yaml
---
@@ -55,7 +54,7 @@ Feature: page-navigation
---
- /v1/catalog/datacenters
- /v1/namespaces
- - /v1/internal/ui/node/node-0?dc=dc-1
+ - /v1/internal/ui/node/node-0?dc=dc-1&ns=@namespace
- /v1/coordinate/nodes?dc=dc-1
---
Scenario: The kv detail page calls the correct API endpoints
diff --git a/ui/packages/consul-ui/tests/integration/adapters/node-test.js b/ui/packages/consul-ui/tests/integration/adapters/node-test.js
index bc9bb45f4..b718e984f 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/node-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/node-test.js
@@ -1,28 +1,42 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
+import { env } from '../../../env';
+const shouldHaveNspace = function(nspace) {
+ return typeof nspace !== 'undefined' && env('CONSUL_NSPACES_ENABLED');
+};
module('Integration | Adapter | node', function(hooks) {
setupTest(hooks);
const dc = 'dc-1';
const id = 'node-name';
- test('requestForQuery returns the correct url', function(assert) {
- const adapter = this.owner.lookup('adapter:node');
- const client = this.owner.lookup('service:client/http');
- const expected = `GET /v1/internal/ui/nodes?dc=${dc}`;
- const actual = adapter.requestForQuery(client.requestParams.bind(client), {
- dc: dc,
+ const undefinedNspace = 'default';
+ [undefinedNspace, 'team-1', undefined].forEach(nspace => {
+ test(`requestForQuery returns the correct url when nspace is ${nspace}`, function(assert) {
+ const adapter = this.owner.lookup('adapter:node');
+ const client = this.owner.lookup('service:client/http');
+ const expected = `GET /v1/internal/ui/nodes?dc=${dc}${
+ shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
+ }`;
+ const actual = adapter.requestForQuery(client.requestParams.bind(client), {
+ dc: dc,
+ ns: nspace,
+ });
+ assert.equal(`${actual.method} ${actual.url}`, expected);
});
- assert.equal(`${actual.method} ${actual.url}`, expected);
- });
- test('requestForQueryRecord returns the correct url', function(assert) {
- const adapter = this.owner.lookup('adapter:node');
- const client = this.owner.lookup('service:client/http');
- const expected = `GET /v1/internal/ui/node/${id}?dc=${dc}`;
- const actual = adapter.requestForQueryRecord(client.requestParams.bind(client), {
- dc: dc,
- id: id,
+ test(`requestForQueryRecord returns the correct url when the nspace is ${nspace}`, function(assert) {
+ const adapter = this.owner.lookup('adapter:node');
+ const client = this.owner.lookup('service:client/http');
+ const expected = `GET /v1/internal/ui/node/${id}?dc=${dc}${
+ shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
+ }`;
+ const actual = adapter.requestForQueryRecord(client.requestParams.bind(client), {
+ dc: dc,
+ id: id,
+ ns: nspace,
+ });
+ assert.equal(`${actual.method} ${actual.url}`, expected);
});
- assert.equal(`${actual.method} ${actual.url}`, expected);
});
+ // the following don't require nspacing
test("requestForQueryRecord throws if you don't specify an id", function(assert) {
const adapter = this.owner.lookup('adapter:node');
const client = this.owner.lookup('service:client/http');