diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js index f3eecaff04e84bfdb2311e872a5d7d338e37d602..dca1323ec5d92212520c6f3aa6c54047eb856d8b 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js @@ -26,8 +26,8 @@ export class TaskList extends Component { // The following values should be lower case ignoreSorting = ['status logs']; TASK_END_STATUSES = ['finished', 'error', 'cancelled']; - TASK_DRAFT_EXPAND = 'task_blueprints,task_blueprints.subtasks,scheduling_unit_draft'; - TASK_BLUEPRINT_EXPAND = 'subtasks,subtasks.output_dataproducts,draft,scheduling_unit_blueprint'; + TASK_DRAFT_EXPAND = 'task_blueprints,task_blueprints.subtasks,scheduling_unit_draft,scheduling_unit_draft.scheduling_set'; + TASK_BLUEPRINT_EXPAND = 'subtasks,subtasks.output_dataproducts,draft,scheduling_unit_blueprint,draft.scheduling_unit_draft,draft.scheduling_unit_draft.scheduling_set'; constructor(props) { super(props); this.getUIAttr(); @@ -44,6 +44,7 @@ export class TaskList extends Component { columnOrders: [ "Status Logs", "Status", + "Project", "Scheduling Unit ID", "Scheduling Unit Name", "ID", @@ -82,7 +83,11 @@ export class TaskList extends Component { name:"Scheduling Unit ID" }, schedulingUnitName: { - name:"Scheduling Unit Name"}, + name:"Scheduling Unit Name" + }, + project: { + name: "Project" + }, id: { name:"ID" }, @@ -158,6 +163,7 @@ export class TaskList extends Component { "Type": "filter-input-75", "Scheduling Unit ID": "filter-input-50", "Scheduling Unit Name": "filter-input-100", + "Project":"filter-input-100", "ID": "filter-input-50", "Control ID": "filter-input-75", "Cancelled": "filter-input-50", @@ -218,6 +224,7 @@ export class TaskList extends Component { getFormattedTaskBlueprints(tasks) { let taskBlueprintsList = []; for (const taskBlueprint of tasks) { + taskBlueprint['project'] = taskBlueprint.draft.scheduling_unit_draft.scheduling_set.project_id; taskBlueprint['status_logs'] = this.subtaskComponent(taskBlueprint); taskBlueprint['tasktype'] = 'Blueprint'; taskBlueprint['actionpath'] = '/task/view/blueprint/' + taskBlueprint['id']; @@ -251,7 +258,7 @@ export class TaskList extends Component { scheduletask['actionpath'] = '/task/view/draft/' + task['id']; scheduletask['blueprint_draft'] = this.getLinksList(task['task_blueprints_ids'], 'blueprint'); scheduletask['status'] = task['status']; - + scheduletask['project'] = task.scheduling_unit_draft.scheduling_set.project_id; //fetch task draft details for (const key of commonkeys) { scheduletask[key] = task[key];