{{#if this.sortedAllocations}}
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index 58ccb6ed2ef..cfd9042adcb 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -130,6 +130,15 @@ module('Acceptance | client detail', function(hooks) {
);
});
+ test('/clients/:id should show empty message if there are no allocations on the node', async function(assert) {
+ const emptyNode = server.create('node');
+
+ await ClientDetail.visit({ id: emptyNode.id });
+
+ assert.true(ClientDetail.emptyAllocations.isVisible, 'Empty message is visible');
+ assert.equal(ClientDetail.emptyAllocations.headline, 'No Allocations');
+ });
+
test('each allocation should have high-level details for the allocation', async function(assert) {
const allocation = server.db.allocations
.where({ nodeId: node.id })
@@ -1000,6 +1009,47 @@ module('Acceptance | client detail', function(hooks) {
assert.notOk(ClientDetail.hasHostVolumes);
});
+
+ testFacet('Job', {
+ facet: ClientDetail.facets.job,
+ paramName: 'job',
+ expectedOptions(allocs) {
+ return Array.from(new Set(allocs.mapBy('jobId'))).sort();
+ },
+ async beforeEach() {
+ server.createList('job', 5);
+ await ClientDetail.visit({ id: node.id });
+ },
+ filter: (alloc, selection) => selection.includes(alloc.jobId),
+ });
+
+ testFacet('Status', {
+ facet: ClientDetail.facets.status,
+ paramName: 'status',
+ expectedOptions: ['Pending', 'Running', 'Complete', 'Failed', 'Lost'],
+ async beforeEach() {
+ server.createList('job', 5, { createAllocations: false });
+ ['pending', 'running', 'complete', 'failed', 'lost'].forEach(s => {
+ server.createList('allocation', 5, { clientStatus: s });
+ });
+
+ await ClientDetail.visit({ id: node.id });
+ },
+ filter: (alloc, selection) => selection.includes(alloc.clientStatus),
+ });
+
+ test('fiter results with no matches display empty message', async function(assert) {
+ const job = server.create('job', { createAllocations: false });
+ server.create('allocation', { jobId: job.id, clientStatus: 'running' });
+
+ await ClientDetail.visit({ id: node.id });
+ const statusFacet = ClientDetail.facets.status;
+ await statusFacet.toggle();
+ await statusFacet.options.objectAt(0).toggle();
+
+ assert.true(ClientDetail.emptyAllocations.isVisible);
+ assert.equal(ClientDetail.emptyAllocations.headline, 'No Matches');
+ });
});
module('Acceptance | client detail (multi-namespace)', function(hooks) {
@@ -1018,7 +1068,11 @@ module('Acceptance | client detail (multi-namespace)', function(hooks) {
// Make a job for each namespace, but have both scheduled on the same node
server.create('job', { id: 'job-1', namespaceId: 'default', createAllocations: false });
- server.createList('allocation', 3, { nodeId: node.id, clientStatus: 'running' });
+ server.createList('allocation', 3, {
+ nodeId: node.id,
+ jobId: 'job-1',
+ clientStatus: 'running',
+ });
server.create('job', { id: 'job-2', namespaceId: 'other-namespace', createAllocations: false });
server.createList('allocation', 3, {
@@ -1047,4 +1101,135 @@ module('Acceptance | client detail (multi-namespace)', function(hooks) {
'Job Two fetched correctly'
);
});
+
+ testFacet('Namespace', {
+ facet: ClientDetail.facets.namespace,
+ paramName: 'namespace',
+ expectedOptions(allocs) {
+ return Array.from(new Set(allocs.mapBy('namespace'))).sort();
+ },
+ async beforeEach() {
+ await ClientDetail.visit({ id: node.id });
+ },
+ filter: (alloc, selection) => selection.includes(alloc.namespace),
+ });
+
+ test('facet Namespace | selecting namespace filters job options', async function(assert) {
+ await ClientDetail.visit({ id: node.id });
+
+ const nsFacet = ClientDetail.facets.namespace;
+ const jobFacet = ClientDetail.facets.job;
+
+ // Select both namespaces.
+ await nsFacet.toggle();
+ await nsFacet.options.objectAt(0).toggle();
+ await nsFacet.options.objectAt(1).toggle();
+ await jobFacet.toggle();
+
+ assert.deepEqual(
+ jobFacet.options.map(option => option.label.trim()),
+ ['job-1', 'job-2']
+ );
+
+ // Select juse one namespace.
+ await nsFacet.toggle();
+ await nsFacet.options.objectAt(1).toggle(); // deselect second option
+ await jobFacet.toggle();
+
+ assert.deepEqual(
+ jobFacet.options.map(option => option.label.trim()),
+ ['job-1']
+ );
+ });
});
+
+function testFacet(label, { facet, paramName, beforeEach, filter, expectedOptions }) {
+ test(`facet ${label} | the ${label} facet has the correct options`, async function(assert) {
+ await beforeEach();
+ await facet.toggle();
+
+ let expectation;
+ if (typeof expectedOptions === 'function') {
+ expectation = expectedOptions(server.db.allocations);
+ } else {
+ expectation = expectedOptions;
+ }
+
+ assert.deepEqual(
+ facet.options.map(option => option.label.trim()),
+ expectation,
+ 'Options for facet are as expected'
+ );
+ });
+
+ test(`facet ${label} | the ${label} facet filters the allocations list by ${label}`, async function(assert) {
+ let option;
+
+ await beforeEach();
+
+ await facet.toggle();
+ option = facet.options.objectAt(0);
+ await option.toggle();
+
+ const selection = [option.key];
+ const expectedAllocs = server.db.allocations
+ .filter(alloc => filter(alloc, selection))
+ .sortBy('modifyIndex')
+ .reverse();
+
+ ClientDetail.allocations.forEach((alloc, index) => {
+ assert.equal(
+ alloc.id,
+ expectedAllocs[index].id,
+ `Allocation at ${index} is ${expectedAllocs[index].id}`
+ );
+ });
+ });
+
+ test(`facet ${label} | selecting multiple options in the ${label} facet results in a broader search`, async function(assert) {
+ const selection = [];
+
+ await beforeEach();
+ await facet.toggle();
+
+ const option1 = facet.options.objectAt(0);
+ const option2 = facet.options.objectAt(1);
+ await option1.toggle();
+ selection.push(option1.key);
+ await option2.toggle();
+ selection.push(option2.key);
+
+ const expectedAllocs = server.db.allocations
+ .filter(alloc => filter(alloc, selection))
+ .sortBy('modifyIndex')
+ .reverse();
+
+ ClientDetail.allocations.forEach((alloc, index) => {
+ assert.equal(
+ alloc.id,
+ expectedAllocs[index].id,
+ `Allocation at ${index} is ${expectedAllocs[index].id}`
+ );
+ });
+ });
+
+ test(`facet ${label} | selecting options in the ${label} facet updates the ${paramName} query param`, async function(assert) {
+ const selection = [];
+
+ await beforeEach();
+ await facet.toggle();
+
+ const option1 = facet.options.objectAt(0);
+ const option2 = facet.options.objectAt(1);
+ await option1.toggle();
+ selection.push(option1.key);
+ await option2.toggle();
+ selection.push(option2.key);
+
+ assert.equal(
+ currentURL(),
+ `/clients/${node.id}?${paramName}=${encodeURIComponent(JSON.stringify(selection))}`,
+ 'URL has the correct query param key and value'
+ );
+ });
+}
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index a4533f532b7..795a227ee23 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -582,4 +582,143 @@ module('Acceptance | task group detail', function(hooks) {
scaleEvents.filter(ev => ev.count == null).length
);
});
+
+ testFacet('Status', {
+ facet: TaskGroup.facets.status,
+ paramName: 'status',
+ expectedOptions: ['Pending', 'Running', 'Complete', 'Failed', 'Lost'],
+ async beforeEach() {
+ ['pending', 'running', 'complete', 'failed', 'lost'].forEach(s => {
+ server.createList('allocation', 5, { clientStatus: s });
+ });
+ await TaskGroup.visit({ id: job.id, name: taskGroup.name });
+ },
+ filter: (alloc, selection) =>
+ alloc.jobId == job.id &&
+ alloc.taskGroup == taskGroup.name &&
+ selection.includes(alloc.clientStatus),
+ });
+
+ testFacet('Client', {
+ facet: TaskGroup.facets.client,
+ paramName: 'client',
+ expectedOptions(allocs) {
+ return Array.from(
+ new Set(
+ allocs
+ .filter(alloc => alloc.jobId == job.id && alloc.taskGroup == taskGroup.name)
+ .mapBy('nodeId')
+ .map(id => id.split('-')[0])
+ )
+ ).sort();
+ },
+ async beforeEach() {
+ const nodes = server.createList('node', 3, 'forceIPv4');
+ nodes.forEach(node =>
+ server.createList('allocation', 5, {
+ nodeId: node.id,
+ jobId: job.id,
+ taskGroup: taskGroup.name,
+ })
+ );
+ await TaskGroup.visit({ id: job.id, name: taskGroup.name });
+ },
+ filter: (alloc, selection) =>
+ alloc.jobId == job.id &&
+ alloc.taskGroup == taskGroup.name &&
+ selection.includes(alloc.nodeId.split('-')[0]),
+ });
});
+
+function testFacet(label, { facet, paramName, beforeEach, filter, expectedOptions }) {
+ test(`facet ${label} | the ${label} facet has the correct options`, async function(assert) {
+ await beforeEach();
+ await facet.toggle();
+
+ let expectation;
+ if (typeof expectedOptions === 'function') {
+ expectation = expectedOptions(server.db.allocations);
+ } else {
+ expectation = expectedOptions;
+ }
+
+ assert.deepEqual(
+ facet.options.map(option => option.label.trim()),
+ expectation,
+ 'Options for facet are as expected'
+ );
+ });
+
+ test(`facet ${label} | the ${label} facet filters the allocations list by ${label}`, async function(assert) {
+ let option;
+
+ await beforeEach();
+
+ await facet.toggle();
+ option = facet.options.objectAt(0);
+ await option.toggle();
+
+ const selection = [option.key];
+ const expectedAllocs = server.db.allocations
+ .filter(alloc => filter(alloc, selection))
+ .sortBy('modifyIndex')
+ .reverse();
+
+ TaskGroup.allocations.forEach((alloc, index) => {
+ assert.equal(
+ alloc.id,
+ expectedAllocs[index].id,
+ `Allocation at ${index} is ${expectedAllocs[index].id}`
+ );
+ });
+ });
+
+ test(`facet ${label} | selecting multiple options in the ${label} facet results in a broader search`, async function(assert) {
+ const selection = [];
+
+ await beforeEach();
+ await facet.toggle();
+
+ const option1 = facet.options.objectAt(0);
+ const option2 = facet.options.objectAt(1);
+ await option1.toggle();
+ selection.push(option1.key);
+ await option2.toggle();
+ selection.push(option2.key);
+
+ const expectedAllocs = server.db.allocations
+ .filter(alloc => filter(alloc, selection))
+ .sortBy('modifyIndex')
+ .reverse();
+
+ TaskGroup.allocations.forEach((alloc, index) => {
+ assert.equal(
+ alloc.id,
+ expectedAllocs[index].id,
+ `Allocation at ${index} is ${expectedAllocs[index].id}`
+ );
+ });
+ });
+
+ test(`facet ${label} | selecting options in the ${label} facet updates the ${paramName} query param`, async function(assert) {
+ const selection = [];
+
+ await beforeEach();
+ await facet.toggle();
+
+ const option1 = facet.options.objectAt(0);
+ const option2 = facet.options.objectAt(1);
+ await option1.toggle();
+ selection.push(option1.key);
+ await option2.toggle();
+ selection.push(option2.key);
+
+ assert.equal(
+ currentURL(),
+ `/jobs/${job.id}/${taskGroup.name}?${paramName}=${encodeURIComponent(
+ JSON.stringify(selection)
+ )}`,
+ 'URL has the correct query param key and value'
+ );
+ });
+}
diff --git a/ui/tests/pages/clients/detail.js b/ui/tests/pages/clients/detail.js
index 70afd69a7d9..bcfe0d2de28 100644
--- a/ui/tests/pages/clients/detail.js
+++ b/ui/tests/pages/clients/detail.js
@@ -14,6 +14,7 @@ import allocations from 'nomad-ui/tests/pages/components/allocations';
import twoStepButton from 'nomad-ui/tests/pages/components/two-step-button';
import notification from 'nomad-ui/tests/pages/components/notification';
import toggle from 'nomad-ui/tests/pages/components/toggle';
+import { multiFacet } from 'nomad-ui/tests/pages/components/facet';
export default create({
visit: visitable('/clients/:id'),
@@ -38,6 +39,12 @@ export default create({
...allocations(),
+ emptyAllocations: {
+ scope: '[data-test-empty-allocations-list]',
+ headline: text('[data-test-empty-allocations-list-headline]'),
+ body: text('[data-test-empty-allocations-list-body]'),
+ },
+
allocationFilter: {
preemptions: clickable('[data-test-filter-preemptions]'),
all: clickable('[data-test-filter-all]'),
@@ -45,6 +52,12 @@ export default create({
allCount: text('[data-test-filter-all]'),
},
+ facets: {
+ namespace: multiFacet('[data-test-allocation-namespace-facet]'),
+ job: multiFacet('[data-test-allocation-job-facet]'),
+ status: multiFacet('[data-test-allocation-status-facet]'),
+ },
+
attributesTable: isPresent('[data-test-attributes]'),
metaTable: isPresent('[data-test-meta]'),
emptyMetaMessage: isPresent('[data-test-empty-meta-message]'),
diff --git a/ui/tests/pages/jobs/job/task-group.js b/ui/tests/pages/jobs/job/task-group.js
index 192ea152a2f..28bd08dbd21 100644
--- a/ui/tests/pages/jobs/job/task-group.js
+++ b/ui/tests/pages/jobs/job/task-group.js
@@ -13,6 +13,7 @@ import error from 'nomad-ui/tests/pages/components/error';
import pageSizeSelect from 'nomad-ui/tests/pages/components/page-size-select';
import stepperInput from 'nomad-ui/tests/pages/components/stepper-input';
import LifecycleChart from 'nomad-ui/tests/pages/components/lifecycle-chart';
+import { multiFacet } from 'nomad-ui/tests/pages/components/facet';
export default create({
pageSize: 25,
@@ -33,6 +34,11 @@ export default create({
isEmpty: isPresent('[data-test-empty-allocations-list]'),
+ facets: {
+ status: multiFacet('[data-test-allocation-status-facet]'),
+ client: multiFacet('[data-test-allocation-client-facet]'),
+ },
+
lifecycleChart: LifecycleChart,
hasVolumes: isPresent('[data-test-volumes]'),
diff --git a/ui/tests/unit/serializers/allocation-test.js b/ui/tests/unit/serializers/allocation-test.js
index 80d58bbd6b7..5250d8336a0 100644
--- a/ui/tests/unit/serializers/allocation-test.js
+++ b/ui/tests/unit/serializers/allocation-test.js
@@ -35,6 +35,7 @@ module('Unit | Serializer | Allocation', function(hooks) {
attributes: {
taskGroupName: 'test-group',
name: 'test-summary[1]',
+ namespace: 'test-namespace',
modifyTime: sampleDate,
createTime: sampleDate,
states: [
@@ -102,6 +103,7 @@ module('Unit | Serializer | Allocation', function(hooks) {
attributes: {
taskGroupName: 'test-group',
name: 'test-summary[1]',
+ namespace: 'test-namespace',
modifyTime: sampleDate,
createTime: sampleDate,
states: [
@@ -172,6 +174,7 @@ module('Unit | Serializer | Allocation', function(hooks) {
attributes: {
taskGroupName: 'test-group',
name: 'test-summary[1]',
+ namespace: 'test-namespace',
modifyTime: sampleDate,
createTime: sampleDate,
states: [
@@ -259,6 +262,7 @@ module('Unit | Serializer | Allocation', function(hooks) {
attributes: {
taskGroupName: 'test-group',
name: 'test-summary[1]',
+ namespace: 'test-namespace',
modifyTime: sampleDate,
createTime: sampleDate,
states: [
@@ -332,6 +336,7 @@ module('Unit | Serializer | Allocation', function(hooks) {
attributes: {
taskGroupName: 'test-group',
name: 'test-summary[1]',
+ namespace: 'test-namespace',
modifyTime: sampleDate,
createTime: sampleDate,
states: [
diff --git a/ui/tests/unit/serializers/volume-test.js b/ui/tests/unit/serializers/volume-test.js
index 72822cf4950..792538fc789 100644
--- a/ui/tests/unit/serializers/volume-test.js
+++ b/ui/tests/unit/serializers/volume-test.js
@@ -260,6 +260,7 @@ module('Unit | Serializer | Volume', function(hooks) {
attributes: {
createTime: REF_DATE,
modifyTime: REF_DATE,
+ namespace: 'namespace-2',
taskGroupName: 'foobar',
wasPreempted: false,
states: [],
@@ -292,6 +293,7 @@ module('Unit | Serializer | Volume', function(hooks) {
attributes: {
createTime: REF_DATE,
modifyTime: REF_DATE,
+ namespace: 'namespace-2',
taskGroupName: 'write-here',
wasPreempted: false,
states: [],
@@ -324,6 +326,7 @@ module('Unit | Serializer | Volume', function(hooks) {
attributes: {
createTime: REF_DATE,
modifyTime: REF_DATE,
+ namespace: 'namespace-2',
taskGroupName: 'look-if-you-must',
wasPreempted: false,
states: [],