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

UI: Change determination of exec sidebar active tasks (#7491) 

This closes #7476. The decomposition of computed properties
is necessary to avoid nested aggregate dependent keys; the
previous dependent key of `taskGroup` will be inadequate
when the sidebar becomes live-updating.
This commit is contained in:
Buck Doyle 2020-03-25 12:08:33 -05:00 committed by GitHub
parent c063e84129
commit 398db02449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/app/components/exec/task-group-parent.js
View File

@ -1,7 +1,7 @@
import Component from '@ember/component';
import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import { or } from '@ember/object/computed';
import { filterBy, mapBy, or } from '@ember/object/computed';
import generateExecUrl from 'nomad-ui/utils/generate-exec-url';
import openExecUrl from 'nomad-ui/utils/open-exec-url';
@ -26,26 +26,34 @@ export default Component.extend({
}
}),
tasksWithRunningStates: computed('taskGroup', function() {
const activeStateTaskNames = this.taskGroup.allocations.reduce(
(activeStateTaskNames, allocation) => {
activeStateTaskNames = activeStateTaskNames.concat(
allocation.states
.filter(
taskState =>
taskState.isActive && taskState.task.taskGroup.name === this.taskGroup.name
)
.mapBy('name')
);
return activeStateTaskNames;
},
[]
);
return this.taskGroup.tasks.filter(task => activeStateTaskNames.includes(task.name));
allocationTaskStatesRecordArrays: mapBy('taskGroup.allocations', 'states'),
allocationTaskStates: computed('allocationTaskStatesRecordArrays.[]', function() {
const flattenRecordArrays = (accumulator, recordArray) =>
accumulator.concat(recordArray.toArray());
return this.allocationTaskStatesRecordArrays.reduce(flattenRecordArrays, []);
}),
activeTaskStates: filterBy('allocationTaskStates', 'isActive'),
activeTasks: mapBy('activeTaskStates', 'task'),
activeTaskGroups: mapBy('activeTasks', 'taskGroup'),
tasksWithRunningStates: computed(
'taskGroup.name',
'activeTaskStates.@each.name',
'activeTasks.@each.name',
'activeTaskGroups.@each.name',
function() {
const activeTaskStateNames = this.activeTaskStates
.filter(taskState => {
return taskState.task && taskState.task.taskGroup.name === this.taskGroup.name;
})
.mapBy('name');
return this.taskGroup.tasks.filter(task => activeTaskStateNames.includes(task.name));
}
),
clickedOpen: false,
actions: {