diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.test.js b/SAS/TMSS/frontend/tmss_webapp/src/App.test.js
index 922bb47eb849a11239141d5c1028f35085f81ef7..d4513f63c5954fc3e5fd831ad7f14fadde299dd1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.test.js
@@ -7,5 +7,3 @@ test('notification dialog exists in the application', () => {
const dialogElement = content.queryByTestId("confirm_dialog");
expect(dialogElement).toBeInTheDocument();
});
-
-//TODO: Need AuthComponent to be validated and check if login screen displayed
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
index 0c115dfd088c29e309d5a8ef8b267dc4c8a0cfaf..8adac9259690fa8b390ba3fd635a6496a9b9e4f4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
@@ -324,11 +324,6 @@ class CycleReportMain extends Component {
const cycleNames = _.map(_.orderBy(this.state.selectedCycles, 'start'), 'name');
let cyclesReportData = [];
- // TODO: Based on API Response time keep this or remove the commented lines
- // for (const cycle of this.state.selectedCycles) {
- // let reportData = await ReportService.getCycleReport(cycle.name);
- // cyclesReportData.push(reportData);
- // }
cyclesReportData = _.values(await ReportService.getCyclesReport(cycleNames));
cyclesReportData.map(cycleReportData => {
cycleReportData["overview"] = cycleReportData.projects_summary;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.project.summary.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.project.summary.js
index da08934a9c5bb034fe64720daba1afb998ae4a97..64c38bf4177c48f3b69ee55360dbd5f2a42efc47 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.project.summary.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.project.summary.js
@@ -27,7 +27,6 @@ class CycleProjectSummary extends Component{
let projectData = {}
projectData['cycle'] = repData.cycle;
projectData['project'] = projData.project;
- // TODO: Update field names and values once API is complete
projectData['durationObserved'] = (projData.durations.total_observed/timeConversionFactor).toFixed(2);
projectData['durationProcessed'] = (projData.durations.total_process/timeConversionFactor).toFixed(2);
const saraData = projData.data_ingested_per_site?_.find(projData.data_ingested_per_site, {"cluster_name":"Sara"}):null;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js
index e1e5d89bbdb7fe920ad96933626ed1a220560b46..e51f176ba54b4292180bc5073ae094ea60b49b0b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js
@@ -115,7 +115,6 @@ export class ReservationSummary extends Component {
{ reservation &&
<div className="p-grid timeline-details-pane" style={{marginTop: '10px'}}>
<h6 className="col-lg-10 col-sm-10">Reservation Details</h6>
- {/* TODO: Enable the link once Reservation view page is created */}
<Link onClick={this.redirectToReservDetails} title="View Full Details" ><i className="fa fa-eye"></i></Link>
{/* <i className="fa fa-eye" style={{color: 'grey'}}></i> */}
<Link to={this.props.location?this.props.location.pathname:"/su/timelineview"} onClick={this.closeSUDets} title="Close Details"><i className="fa fa-times"></i></Link>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 62620451b860bb953929e1dfa9f00c0d049052e7..2c0a07f827947a0210f0366499f17eb27cc3cdef 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -1422,7 +1422,6 @@ class SchedulingUnitList extends Component{
suName: item.name,
status: 'Success'
});
- // this.reloadData() //TODO: should remove this function if not required anymore.
} else {
this.failedSchedulingUnits.push({
suId: item.id,
@@ -2553,9 +2552,6 @@ class SchedulingUnitList extends Component{
scheduleunit['scheduling_set'] = scheduleunit.draft.scheduling_set.name;
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, scheduleunit.id);
scheduleunit['workflowStatus'] = workflowDetails.status;
- //scheduleunit['dataAccepted'] = workflowDetails.dataAccepted;
- // TODO: When time taken to load all workflow data increases, change to load individual workflow data
- //scheduleunit['workflowStatus'] = this.timelineCommonUtils.getWorkflowStatus(scheduleunit);
scheduleunit.duration = moment.utc((scheduleunit.duration || 0)*1000).format('HH:mm:ss');
scheduleunit.type= 'Blueprint';
scheduleunit['actionpath'] ='/schedulingunit/view/blueprint/'+scheduleunit.id;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index 23279cb9ee09fd0fc3cade7d3c63eee7f5bf7fbc..72fa9e96f43c78ed584425acb1b195d0d4c9e33f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -577,7 +577,6 @@ class ViewSchedulingUnit extends Component {
let bandPassFilter = null;
let stationGroups = {};
const $strategyRefs = await $RefParser.resolve(observStrategy.template);
- // TODo: This schema reference resolving code has to be moved to common file and needs to rework
for (const param of parameters) {
// TODO: make parameter handling more generic, instead of task specific.
if (!param.refs[0].startsWith("#/tasks/")) { continue; }
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 617f25ead34d4112ff03cdea6aeb1b1321a0db3b..9fd40ee2fc6b500e1e36e41fe9374219b5349218 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -219,8 +219,6 @@ export class TaskView extends Component {
if (this.state.editorFunction) {
this.state.editorFunction();
}
- // TODO: Need to make it working with resolved schema
- // taskTemplate.schema = await UtilService.getResolvedSchema(taskTemplate.url);
if(taskType === 'draft' && task.task_blueprints_ids && task.task_blueprints_ids.length > 0) {
this.setState({schedulingUnit: schedulingUnit, supath:path, targetTask: targetTask, hasBlueprint: true, task: task, taskTemplate: taskTemplate, isLoading: false, taskId: taskId, taskType: taskType});
} else {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
index 786a42144df48295e6092ab1a5662a48f856a6af..ab9ab4f8989cbd6007a6ea787363ca3b136b54d3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
@@ -7,72 +7,6 @@ const ReportService = {
try {
const response = await axios.get(`/api/project/${project}/report/`);
reportData = response.data;
- // TODO: TEST DATA to be removed
- /*reportData = {
- "project": "test_for_report",
- "quota": [
- {
- "id": 4,
- "resource_type_id": "CEP Processing Time",
- "value": 7200
- },
- {
- "id": 5,
- "resource_type_id": "LOFAR Observing Time",
- "value": 7200
- },
- {
- "id": 6,
- "resource_type_id": "LTA Storage",
- "value": 64*1024*1024*1024
- }
- ],
- "SUBs": {
- "successful": [
- {
- "id": 1,
- "name": "my_scheduling_unit_blueprint_30a70066-c09b-48f1-8061-c7e20017af9d",
- "status": "finished",
- "start": "2021-07-29T14:15:44.330405",
- "stop": "2021-07-29T14:25:44.330407",
- "duration": 600.000002,
- "observed_duration": 600.000002,
- "target": null,
- "SAS ID": {
- "observation control": [2000014, 200010],
- "preprocessing pipeline": [],
- "pulsar pipeline": [200023]
- },
- "ingested_date": "2021-07-29T14:25:44.330407",
- "ingested_data_size": 246
- }
- ],
- "failed": []
- },
- "durations": {
- "total": 2400.000011,
- "total_not_cancelled": 1800.000008,
- "total_succeeded": 600.000002,
- "total_failed": 600.000003,
- "total_observed": 1200.0000049999999,
- "total_observed_succeeded": 600.000002,
- "total_observed_failed": 600.000003,
- "total_succeeded_A": 600.000002,
- "total_observed_succeeded_A": 600.000002,
- "total_succeeded_B": 0,
- "total_observed_succeeded_B": 0,
- "not_cancelled_perc": 0.75,
- "succeeded_perc": 0.25,
- "failed_perc": 0.25,
- "observed_perc": 0.50,
- "observed_succeeded_perc": 0.25,
- "observed_failed_perc": 0.25},
- "LTA dataproducts": {"size__sum": 246},
- "SAPs exposure": {
- "target1": 7200.0,
- "target2": 3200.0
- }
- }*/
} catch(error) {
console.error(error);
reportData.error = error;