kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 10:55:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3956 from hashicorp/b-ui-placement-failures-persist

Browse Source 
Only show the placement failures section if there is a blocked eval
This commit is contained in:
Michael Lange
2018-03-08 16:06:17 -08:00
committed by GitHub
parent 220790f3fa a1e34f0258
commit bc4ae22a39
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/models/evaluation.js
View File

@@ -1,4 +1,4 @@
import { bool } from '@ember/object/computed';
import { bool, equal } from '@ember/object/computed';
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import { belongsTo } from 'ember-data/relationships';
@@ -15,6 +15,7 @@ export default Model.extend({
failedTGAllocs: fragmentArray('placement-failure', { defaultValue: () => [] }),
hasPlacementFailures: bool('failedTGAllocs.length'),
isBlocked: equal('status', 'blocked'),
// TEMPORARY: https://github.com/emberjs/data/issues/5209
originalJobId: attr('string'),

10
ui/app/models/job.js
View File

@@ -1,4 +1,4 @@
import { alias, bool, equal, or } from '@ember/object/computed';
import { alias, equal, or, and } from '@ember/object/computed';
import { computed } from '@ember/object';
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
@@ -106,7 +106,13 @@ export default Model.extend({
evaluations: hasMany('evaluations'),
namespace: belongsTo('namespace'),
hasPlacementFailures: bool('latestFailureEvaluation'),
hasBlockedEvaluation: computed('evaluations.@each.isBlocked', function() {
return this.get('evaluations')
.toArray()
.some(evaluation => evaluation.get('isBlocked'));
}),
hasPlacementFailures: and('latestFailureEvaluation', 'hasBlockedEvaluation'),
latestEvaluation: computed('evaluations.@each.modifyIndex', 'evaluations.isPending', function() {
const evaluations = this.get('evaluations');

4
ui/mirage/factories/evaluation.js
View File

@@ -4,7 +4,7 @@ import { provide, pickOne } from '../utils';
import { DATACENTERS } from '../common';
const EVAL_TYPES = ['system', 'service', 'batch'];
const EVAL_STATUSES = ['blocked', 'pending', 'complete', 'failed', 'canceled'];
const EVAL_STATUSES = ['pending', 'complete', 'failed', 'canceled'];
const EVAL_TRIGGERED_BY = [
'job-register',
'job-deregister',
@@ -55,7 +55,7 @@ export default Factory.extend({
modifyIndex: () => faker.random.number({ min: 10, max: 2000 }),
withPlacementFailures: trait({
status: faker.list.random(...EVAL_STATUSES.without('blocked')),
status: 'blocked',
afterCreate(evaluation, server) {
assignJob(evaluation, server);
const taskGroups = server.db.taskGroups.where({ jobId: evaluation.jobId });