Change down to highest-priority composite status

As pointed out by Nick Ethier, if a node was ineligible before it went down, downness should be displayed, not ineligibility.
hashicorp · Jan 29, 2021 · 9adfcf7 · 9adfcf7
1 parent f51d035
commit 9adfcf7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/ui/app/models/node.js b/ui/app/models/node.js
@@ -102,7 +102,9 @@ export default class Node extends Model {
   // Useful for coloring and sorting nodes
   @computed('isDraining', 'isEligible', 'status')
   get compositeStatus() {
-    if (this.isDraining) {
+    if (this.status === 'down') {
+      return 'down';
+    } else if (this.isDraining) {
       return 'draining';
     } else if (!this.isEligible) {
       return 'ineligible';

diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
@@ -457,6 +457,7 @@ module('Acceptance | client detail', function(hooks) {
     node = server.create('node', {
       drain: false,
       schedulingEligibility: 'ineligible',
+      status: 'ready',
     });
 
     await ClientDetail.visit({ id: node.id });

diff --git a/ui/tests/acceptance/clients-list-test.js b/ui/tests/acceptance/clients-list-test.js
@@ -46,7 +46,10 @@ module('Acceptance | clients list', function(hooks) {
   });
 
   test('each client record should show high-level info of the client', async function(assert) {
-    const node = server.create('node', 'draining');
+    const node = server.create('node', 'draining', {
+      status: 'ready',
+    });
+
     server.createList('agent', 1);
 
     await ClientsList.visit();
@@ -99,23 +102,29 @@ module('Acceptance | clients list', function(hooks) {
     server.createList('agent', 1);
 
     server.create('node', {
-      modifyIndex: 4,
+      modifyIndex: 5,
       status: 'ready',
       schedulingEligibility: 'eligible',
       drain: false,
     });
     server.create('node', {
-      modifyIndex: 3,
+      modifyIndex: 4,
       status: 'initializing',
       schedulingEligibility: 'eligible',
       drain: false,
     });
     server.create('node', {
-      modifyIndex: 2,
+      modifyIndex: 3,
       status: 'down',
       schedulingEligibility: 'eligible',
       drain: false,
     });
+    server.create('node', {
+      modifyIndex: 2,
+      status: 'down',
+      schedulingEligibility: 'ineligible',
+      drain: false,
+    });
     server.create('node', {
       modifyIndex: 1,
       status: 'ready',
@@ -137,12 +146,13 @@ module('Acceptance | clients list', function(hooks) {
 
     assert.equal(ClientsList.nodes[1].compositeStatus.text, 'initializing');
     assert.equal(ClientsList.nodes[2].compositeStatus.text, 'down');
+    assert.equal(ClientsList.nodes[2].compositeStatus.text, 'down', 'down takes priority over ineligible');
 
-    assert.equal(ClientsList.nodes[3].compositeStatus.text, 'ineligible');
-    assert.ok(ClientsList.nodes[3].compositeStatus.isWarning, 'expected warning class');
+    assert.equal(ClientsList.nodes[4].compositeStatus.text, 'ineligible');
+    assert.ok(ClientsList.nodes[4].compositeStatus.isWarning, 'expected warning class');
 
-    assert.equal(ClientsList.nodes[4].compositeStatus.text, 'draining');
-    assert.ok(ClientsList.nodes[4].compositeStatus.isInfo, 'expected info class');
+    assert.equal(ClientsList.nodes[5].compositeStatus.text, 'draining');
+    assert.ok(ClientsList.nodes[5].compositeStatus.isInfo, 'expected info class');
 
     await ClientsList.sortBy('compositeStatus');
 
@@ -152,13 +162,14 @@ module('Acceptance | clients list', function(hooks) {
       'ineligible',
       'draining',
       'down',
+      'down',
     ]);
 
     // Simulate a client state change arriving through polling
     let readyClient = this.owner
       .lookup('service:store')
       .peekAll('node')
-      .findBy('modifyIndex', 4);
+      .findBy('modifyIndex', 5);
     readyClient.set('schedulingEligibility', 'ineligible');
 
     await settled();
@@ -169,6 +180,7 @@ module('Acceptance | clients list', function(hooks) {
       'ineligible',
       'draining',
       'down',
+      'down',
     ]);
   });