Merge remote-tracking branch 'origin/TMSS-634'

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js

@@ -21,7 +21,7 @@ class SchedulingUnitList extends Component{
             name:"Type",
             filter:"select"
         },
-        requirements_template_id:{
+        observation_strategy_template_id:{
             name: "Template ID",
             filter: "select"
         },
@@ -222,18 +222,20 @@ class SchedulingUnitList extends Component{
         //         });
         //     }
         // }   else { 
-            const suTemplate = {};
+            
             const schedulingSet = await ScheduleService.getSchedulingSets();
             const projects = await ScheduleService.getProjectList();
             const promises = [ScheduleService.getSchedulingUnitsExtended('blueprint'), 
                                 ScheduleService.getSchedulingUnitsExtended('draft'),
                                 ScheduleService.getMainGroupStations(),
-                                WorkflowService.getWorkflowProcesses()];
+                                WorkflowService.getWorkflowProcesses(),
+                                ScheduleService.getObservationStrategies()];
             Promise.all(promises).then(async responses => {
                 const blueprints = responses[0];
                 let scheduleunits = responses[1];
                 this.mainStationGroups = responses[2];
                 let workflowProcesses = responses[3];
+                const suTemplates =  responses[4];
                 const output = [];
                 for( const scheduleunit  of scheduleunits){
                     const suSet = schedulingSet.find((suSet) => { return  scheduleunit.scheduling_set_id === suSet.id });
@@ -241,13 +243,8 @@ class SchedulingUnitList extends Component{
                     if (!this.props.project || (this.props.project && project.name===this.props.project)) {
                         scheduleunit['status'] = null;
                         scheduleunit['workflowStatus'] = null;
-                        if (!suTemplate[scheduleunit.requirements_template_id]) {
-                            const response = await ScheduleService.getSchedulingUnitTemplate(scheduleunit.requirements_template_id);
-                            scheduleunit['template_description'] = response.description;
-                            suTemplate[scheduleunit.requirements_template_id] = response;
-                        } else {
-                            scheduleunit['template_description'] = suTemplate[scheduleunit.requirements_template_id].description;
-                        }
+                        const obsStrategyTemplate = _.find(suTemplates, ['id',scheduleunit.observation_strategy_template_id]);
+                        scheduleunit['template_description'] = obsStrategyTemplate.description;
                         scheduleunit['linked_bp_draft'] = this.getLinksList(scheduleunit.scheduling_unit_blueprints_ids, 'blueprint');
                         scheduleunit['task_content'] = this.getTaskTypeGroupCounts(scheduleunit['task_drafts']);
                         scheduleunit['station_group'] = this.getStationGroup(scheduleunit).counts;
@@ -262,7 +259,8 @@ class SchedulingUnitList extends Component{
                             blueP['updated_at'] = moment(blueP['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:ss");
                             blueP['task_content'] = this.getTaskTypeGroupCounts(blueP['task_blueprints']);
                             blueP['linked_bp_draft'] = this.getLinksList([blueP.draft_id], 'draft');
-                            blueP['template_description'] = suTemplate[blueP.requirements_template_id].description;
+                            blueP['template_description'] = obsStrategyTemplate.description;
+                            blueP['observation_strategy_template_id'] = obsStrategyTemplate.id;
                             blueP['station_group'] = this.getStationGroup(blueP).counts;
                             blueP.project = project.name;
                             blueP.canSelect = false;

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js

@@ -180,6 +180,11 @@ class ViewSchedulingUnit extends Component{
                         this.constraintTemplates = response;
                         this.setState({ constraintSchema:  this.constraintTemplates.find(i => i.id === schedulingUnit.scheduling_constraints_template_id) })
                     });
+                    if (schedulingUnit.draft_id) {
+                        await ScheduleService.getSchedulingUnitDraftById(schedulingUnit.draft_id).then((response) => {
+                            schedulingUnit['observation_strategy_template_id'] = response.observation_strategy_template_id;
+                        });
+                    }
                     let tasks = schedulingUnit.task_drafts?(await this.getFormattedTaskDrafts(schedulingUnit)):this.getFormattedTaskBlueprints(schedulingUnit);
                     let ingestGroup = tasks.map(task => ({name: task.name, canIngest: task.canIngest, type_value: task.type_value, id: task.id }));
                     ingestGroup = _.groupBy(_.filter(ingestGroup, 'type_value'), 'type_value');
@@ -416,7 +421,7 @@ class ViewSchedulingUnit extends Component{
                             <label className="col-lg-2 col-md-2 col-sm-12" >Duration (HH:mm:ss)</label>
                             <span className="col-lg-4 col-md-4 col-sm-12">{moment.utc((this.state.scheduleunit.duration?this.state.scheduleunit.duration:0)*1000).format('HH:mm:ss')}</span>
                             <label className="col-lg-2 col-md-2 col-sm-12">Template ID</label>
-                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.scheduleunit.requirements_template_id}</span>
+                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.scheduleunit.observation_strategy_template_id}</span>
                         </div>
                         <div className="p-grid">
                             {this.state.scheduleunit.scheduling_set_object.project_id &&