Merge pull request #8714 from hashicorp/f-ui/always-show-scale-event-…

…accordion

UI: Always show the scaling events accordion

ui/app/templates/jobs/job/task-group.hbs

@@ -147,16 +147,16 @@
           <ScaleEventsChart @events={{this.sortedScaleEvents}} />
         </div>
       </div>
-    {{else}}
-      <div data-test-scaling-events class="boxed-section">
-        <div class="boxed-section-head">
-          Recent Scaling Events
-        </div>
-        <div class="boxed-section-body">
-          <ScaleEventsAccordion @events={{this.sortedScaleEvents}} />
-        </div>
-      </div>
     {{/if}}
+
+    <div data-test-scaling-events class="boxed-section">
+      <div class="boxed-section-head">
+        Recent Scaling Events
+      </div>
+      <div class="boxed-section-body">
+        <ScaleEventsAccordion @events={{this.sortedScaleEvents}} />
+      </div>
+    </div>
   {{/if}}
 
   {{#if this.model.volumes.length}}

ui/tests/acceptance/task-group-detail-test.js

@@ -455,7 +455,7 @@ module('Acceptance | task group detail', function(hooks) {
     });
   });
 
-  test('when a task group has at least two count scaling events and the count scaling events outnumber the non-count scaling events, a timeline is shown instead of an accordion', async function(assert) {
+  test('when a task group has at least two count scaling events and the count scaling events outnumber the non-count scaling events, a timeline is shown in addition to the accordion', async function(assert) {
     const taskGroupScale = job.jobScale.taskGroupScales.models.find(m => m.name === taskGroup.name);
     taskGroupScale.update({
       events: [
@@ -473,7 +473,7 @@ module('Acceptance | task group detail', function(hooks) {
     const scaleEvents = taskGroupScale.events.models.sortBy('time').reverse();
     await TaskGroup.visit({ id: job.id, name: taskGroup.name });
 
-    assert.notOk(TaskGroup.hasScaleEvents);
+    assert.ok(TaskGroup.hasScaleEvents);
     assert.ok(TaskGroup.hasScalingTimeline);
 
     assert.equal(