From b8880c0b942e09c75f28171163ff69e1027f8e76 Mon Sep 17 00:00:00 2001 From: Phil Renaud Date: Tue, 11 Jun 2024 16:58:50 -0400 Subject: [PATCH] Remove simulacral allocation stat in favor of live-updating one --- .changelog/23306.txt | 3 +++ ui/app/components/job-status/panel/steady.hbs | 4 ++-- ui/app/components/job-status/panel/steady.js | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .changelog/23306.txt diff --git a/.changelog/23306.txt b/.changelog/23306.txt new file mode 100644 index 00000000000..36c48fa0bd9 --- /dev/null +++ b/.changelog/23306.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: unbind job detail running allocations count from job-summary endpoint +``` diff --git a/ui/app/components/job-status/panel/steady.hbs b/ui/app/components/job-status/panel/steady.hbs index 9ae423798d8..1c6aa1c2ef1 100644 --- a/ui/app/components/job-status/panel/steady.hbs +++ b/ui/app/components/job-status/panel/steady.hbs @@ -32,7 +32,7 @@ All allocations have completed successfully {{else}} - {{@job.runningAllocs ~}} + {{this.runningAllocs.length ~}} {{#unless this.atMostOneAllocPerNode ~}} {{#if (eq @job.type "batch") ~}} /{{this.totalNonCompletedAllocs}} @@ -42,7 +42,7 @@ {{/unless}} {{#if (eq @job.type "batch") ~}}Remaining{{/if}} - {{pluralize "Allocation" @job.runningAllocs}} Running + {{pluralize "Allocation" this.runningAllocs.length}} Running {{/if}} diff --git a/ui/app/components/job-status/panel/steady.js b/ui/app/components/job-status/panel/steady.js index ac03654b7dd..a4aabdd0c79 100644 --- a/ui/app/components/job-status/panel/steady.js +++ b/ui/app/components/job-status/panel/steady.js @@ -185,6 +185,10 @@ export default class JobStatusPanelSteadyComponent extends Component { return this.job.allocations.filter((a) => !a.isOld && a.hasBeenRestarted); } + get runningAllocs() { + return this.job.allocations.filter((a) => a.clientStatus === 'running'); + } + get completedAllocs() { return this.job.allocations.filter( (a) => !a.isOld && a.clientStatus === 'complete'