Merge 70ef9b4 into backport/ui/service-health-unknown-when-parent-all…

…oc-not-running/usually-tops-midge
hashicorp · Jun 9, 2023 · 9fa43a1 · 9fa43a1
2 parents db39227 + 70ef9b4
commit 9fa43a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ui/app/components/allocation-service-sidebar.js b/ui/app/components/allocation-service-sidebar.js
@@ -33,7 +33,7 @@ export default class AllocationServiceSidebarComponent extends Component {
   }
 
   get aggregateStatus() {
-    if (this.args.allocation?.clientStatus != -'running') return 'Unknown';
+    if (this.args.allocation?.clientStatus !== 'running') return 'Unknown';
     return this.checks.any((check) => check.Status === 'failure')
       ? 'Unhealthy'
       : 'Healthy';

diff --git a/ui/tests/integration/components/allocation-service-sidebar-test.js b/ui/tests/integration/components/allocation-service-sidebar-test.js
@@ -71,7 +71,7 @@ module(
       };
 
       this.set('closeSidebar', () => this.set('service', null));
-      this.set('allocation', { id: 'myAlloc' });
+      this.set('allocation', { id: 'myAlloc', clientStatus: 'running' });
       this.set('service', healthyService);
       await render(
         hbs`<AllocationServiceSidebar @service={{this.service}} @allocation={{this.allocation}} @fns={{hash closeSidebar=this.closeSidebar}} />`
@@ -86,6 +86,13 @@ module(
         hbs`<AllocationServiceSidebar @service={{this.service}} @allocation={{this.allocation}} @fns={{hash closeSidebar=this.closeSidebar}} />`
       );
       assert.dom('h1 .aggregate-status').includesText('Unhealthy');
+
+      this.set('service', healthyService);
+      this.set('allocation', { id: 'myAlloc2', clientStatus: 'failed' });
+      await render(
+        hbs`<AllocationServiceSidebar @service={{this.service}} @allocation={{this.allocation}} @fns={{hash closeSidebar=this.closeSidebar}} />`
+      );
+      assert.dom('h1 .aggregate-status').includesText('Health Unknown');
     });
 
     test('it handles Consul services with reduced functionality', async function (assert) {