Merge pull request #11281 from hashicorp/f-final-changes

refactor forceCollapsed logic to use hasClientStatus prop
hashicorp · Oct 6, 2021 · 7bb2478 · 7bb2478
2 parents 7ca852b + 452835d
commit 7bb2478
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/templates/components/job-page/parameterized-child.hbs
@@ -54,7 +54,7 @@
       @jobClientStatus={{this.jobClientStatus}}
     />
   {{/if}}
-  <JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.isSysBatch}} />
+  <JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.job.hasClientStatus}} />
   <JobPage::Parts::PlacementFailures @job={{this.job}} />
   <JobPage::Parts::TaskGroups
     @job={{this.job}}

diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/templates/components/job-page/periodic-child.hbs
@@ -54,7 +54,7 @@
       @jobClientStatus={{this.jobClientStatus}}
     />
   {{/if}}
-  <JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.isSysBatch}} />
+  <JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.job.hasClientStatus}} />
   <JobPage::Parts::PlacementFailures @job={{this.job}} />
   <JobPage::Parts::TaskGroups
     @job={{this.job}}

diff --git a/ui/tests/unit/utils/job-client-status-test.js b/ui/tests/unit/utils/job-client-status-test.js
@@ -251,7 +251,7 @@ module('Unit | Util | JobClientStatus', function() {
       datacenters: ['dc1'],
       status: 'pending',
       allocations: [
-        { node, clientStatus: 'starting' }, // technically shouldn't be possible but testing the logic
+        { node, clientStatus: 'starting' },
         { node, clientStatus: 'starting' },
         { node, clientStatus: 'starting' },
       ],