luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Model isRunning based on the client status of the allocation

Browse source
This commit is contained in:
Michael Lange 2018-12-06 17:11:01 -08:00
parent 48adb393d8
commit 076ae5046b
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/app/models/allocation.js
View file

@ -1,5 +1,6 @@
import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import { equal } from '@ember/object/computed';
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import { belongsTo } from 'ember-data/relationships';
@ -38,6 +39,8 @@ export default Model.extend({
return STATUS_ORDER[this.get('clientStatus')] || 100;
}),
isRunning: equal('clientStatus', 'running'),
// When allocations are server-side rescheduled, a paper trail
// is left linking all reschedule attempts.
previousAllocation: belongsTo('allocation', { inverse: 'nextAllocation' }),

7
ui/app/models/task-state.js
View file

@ -1,11 +1,12 @@
import { none } from '@ember/object/computed';
import { computed } from '@ember/object';
import { alias } from '@ember/object/computed';
import { alias, none } from '@ember/object/computed';
import Fragment from 'ember-data-model-fragments/fragment';
import attr from 'ember-data/attr';
import { fragment, fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes';
export default Fragment.extend({
allocation: fragmentOwner(),
name: attr('string'),
state: attr('string'),
startedAt: attr('date'),
@ -13,8 +14,8 @@ export default Fragment.extend({
failed: attr('boolean'),
isActive: none('finishedAt'),
isRunning: alias('allocation.isRunning'),
allocation: fragmentOwner(),
task: computed('allocation.taskGroup.tasks.[]', function() {
const tasks = this.get('allocation.taskGroup.tasks');
return tasks && tasks.findBy('name', this.get('name'));