Failed or lost cell condensed

hashicorp · May 23, 2023 · f8a3089 · f8a3089
1 parent 881083e
commit f8a3089
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 44 deletions.
diff --git a/ui/app/components/job-status/failed-or-lost.hbs b/ui/app/components/job-status/failed-or-lost.hbs
@@ -1,36 +1,41 @@
 <section class="failed-or-lost">
-  <h4>
-    {{@title}}
-    <span
-      class="tooltip multiline text-center"
-      role="tooltip"
-      aria-label={{@description}}
-    >
-      <FlightIcon @name="info" />
-    </span>
-  </h4>
-  {{#if (eq @title "Rescheduled")}}
+  <h4>Replaced Allocations</h4>
+  {{#if @supportsRescheduling}}
     <ConditionalLinkTo
-      @condition={{this.shouldLinkToAllocations}}
+      @condition={{@rescheduledAllocs.length}}
       @route="jobs.job.allocations"
       @model={{@job}}
       @query={{hash scheduling='["has-been-rescheduled"]' version=(concat '[' @job.latestDeployment.versionNumber ']')}}
       @label="View Allocations"
       @class="failed-or-lost-link"
     >
-      {{@allocs.length}}
+      <span
+        class="tooltip multiline text-center"
+        role="tooltip"
+        aria-label="Allocations that have been rescheduled, on another node if possible, due to failure"
+      >
+        <FlightIcon @name="info" />
+      </span>
+      {{@rescheduledAllocs.length}} Rescheduled
     </ConditionalLinkTo>
   {{/if}}
-  {{#if (eq @title "Restarted")}}
-    <ConditionalLinkTo
-      @condition={{this.shouldLinkToAllocations}}
-      @route="jobs.job.allocations"
-      @model={{@job}}
-      @query={{hash scheduling='["has-been-restarted"]' version=(concat '[' @job.latestDeployment.versionNumber ']')}}
-      @label="View Allocations"
-      @class="failed-or-lost-link"
+
+  <ConditionalLinkTo
+    @condition={{@restartedAllocs.length}}
+    @route="jobs.job.allocations"
+    @model={{@job}}
+    @query={{hash scheduling='["has-been-restarted"]' version=(concat '[' @job.latestDeployment.versionNumber ']')}}
+    @label="View Allocations"
+    @class="failed-or-lost-link"
+  >
+    <span
+      class="tooltip multiline text-center"
+      role="tooltip"
+      aria-label="Allocations that have been restarted in-place due to a task failure"
     >
-      {{@allocs.length}}
-    </ConditionalLinkTo>
-  {{/if}}
+      <FlightIcon @name="info" />
+    </span>
+    {{@restartedAllocs.length}} Restarted
+  </ConditionalLinkTo>
+
 </section>
diff --git a/ui/app/components/job-status/failed-or-lost.js b/ui/app/components/job-status/failed-or-lost.js
diff --git a/ui/app/components/job-status/panel/steady.hbs b/ui/app/components/job-status/panel/steady.hbs
@@ -58,20 +58,12 @@
           {{/each}}
         </legend>
 
-        {{#if this.supportsRescheduling}}
-          <JobStatus::FailedOrLost
-            @allocs={{this.rescheduledAllocs}}
-            @job={{@job}}
-            @title="Rescheduled"
-            @description="Allocations that have been rescheduled, on another node if possible, due to failure"
-          />
-        {{/if}}
 
         <JobStatus::FailedOrLost
-          @allocs={{this.restartedAllocs}}
+          @rescheduledAllocs={{this.rescheduledAllocs}}
+          @restartedAllocs={{this.restartedAllocs}}
           @job={{@job}}
-          @title="Restarted"
-          @description="Allocations that have been restarted in-place due to a task failure"
+          @supportsRescheduling={{this.supportsRescheduling}}
         />
 
         <section class="versions">

diff --git a/ui/app/styles/components/job-status-panel.scss b/ui/app/styles/components/job-status-panel.scss
@@ -80,8 +80,8 @@
     .failed-or-lost {
       .failed-or-lost-link {
         display: block;
-        font-size: 1.5rem;
-        font-weight: bold;
+        // font-size: 1.5rem;
+        // font-weight: bold;
       }
     }
   }