Skip to content

Commit 1f5a808

Browse files
committed
fix the filtering for "unfinished jobs" to all non-terminal
do not mention cutoff when all unfinished are displayed drop mention of regex for search, that is not implemented
1 parent c645eda commit 1f5a808

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

client/src/components/admin/JobsList.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</b-input-group>
3636
</b-form-group>
3737
</b-form>
38-
<b-form-group description="Use strings or regular expressions to search jobs.">
38+
<b-form-group>
3939
<IndexFilter v-bind="filterAttrs" id="job-search" v-model="filter" />
4040
</b-form-group>
4141
</b-col>
@@ -183,7 +183,12 @@ export default {
183183
return `These jobs have completed in the previous ${this.cutoffMin} minutes.`;
184184
},
185185
runningTableCaption() {
186-
return `These jobs are unfinished and have had their state updated in the previous ${this.cutoffMin} minutes. For currently running jobs, the "Last Update" column should indicate the runtime so far.`;
186+
let message = `These jobs are unfinished`;
187+
if (!this.showAllRunning) {
188+
message += ` and have had their state updated in the previous ${this.cutoffMin} minutes`;
189+
}
190+
message += `. For currently running jobs, the "Last Update" column should indicate the runtime so far.`;
191+
return message;
187192
},
188193
finishedNoJobsMessage() {
189194
return `There are no recently finished jobs to show with current cutoff time of ${this.cutoffMin} minutes.`;
@@ -238,7 +243,7 @@ export default {
238243
this.busy = true;
239244
const params = { view: "admin_job_list" };
240245
if (this.showAllRunning) {
241-
params.state = "running";
246+
params.state = NON_TERMINAL_STATES;
242247
} else {
243248
const cutoff = Math.floor(this.cutoffMin);
244249
const dateRangeMin = new Date(Date.now() - cutoff * 60 * 1000).toISOString();

0 commit comments

Comments
 (0)