Merge branch 'TMSS-1904-TestFix' into 'master'

Fixed failing tests

See merge request !929

SAS/TMSS/frontend/tmss_webapp/prepareTemplateSchemas.js

@@ -191,7 +191,7 @@ getTemplateFiles('../../../../install/opt/lofar/share/tmss/schemas').then(async(
 
 		getTemplateFiles("build/schemas/scheduling_constraints_template").then(async(strategyFiles) => {
 			let index = 0
-			const constraintDefinitionKeys = [ "distance_on_sky", "elevation", "timedelta", "timestamp", "timewindow"];
+			const constraintDefinitionKeys = [ "distance_on_sky", "elevation", "timedelta", "timestamp", "timewindow", "pointing"];
 			for (const file of strategyFiles) {
 				const data = fs.readFileSync(file, 'utf8');
 				let constraintTemplate = JSON.parse(data);

SAS/TMSS/frontend/tmss_webapp/prepareTemplateSchemas_dev.js

@@ -185,7 +185,7 @@ getTemplateFiles('../../backend/src/tmss/tmssapp/schemas').then(async(backEndFil
 
 		getTemplateFiles("build/schemas/scheduling_constraints_template").then(async(strategyFiles) => {
 			let index = 0
-			const constraintDefinitionKeys = [ "distance_on_sky", "elevation", "timedelta", "timestamp", "timewindow"];
+			const constraintDefinitionKeys = [ "distance_on_sky", "elevation", "timedelta", "timestamp", "timewindow", "pointing"];
 			for (const file of strategyFiles) {
 				const data = fs.readFileSync(file, 'utf8');
 				let constraintTemplate = JSON.parse(data);

SAS/TMSS/frontend/tmss_webapp/src/__mocks__/observing_strategy_templates_test_data.json

@@ -40,7 +40,7 @@
             "Observation description": "OOO.O _Target_name_",
             "Pipeline description": "oOOO.O _Target_name_",
             "Pipeline Calibrator description": "oOOO.O 3Cabc",
-            "total_direction_type": 2,
+            "total_direction_type": 3,
             "Target Pointing": {
                 "angle1": "02h31m49.09s",
                 "angle2": "89d15m50.8s",
@@ -102,7 +102,7 @@
             "Observation description": "OOO.O _Target_name_",
             "Pipeline description": "oOOO.O _Target_name_",
             "Pipeline Calibrator description": "oOOO.O 3Cabc",
-            "total_direction_type": 2,
+            "total_direction_type": 3,
             "Target Pointing": {
                 "angle1": "02h31m49.09s",
                 "angle2": "89d15m50.8s",
@@ -182,7 +182,7 @@
                 "target": "3Cabc",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 4,
+            "total_direction_type": 5,
             "Time averaging steps": "4",
             "Frequency averaging steps": "8",
             "Demix ignore target Pipeline Target 1": false,
@@ -258,7 +258,7 @@
                 "target": "3Cabc",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 4,
+            "total_direction_type": 5,
             "Time averaging steps": "4",
             "Frequency averaging steps": "8",
             "Demix ignore target Pipeline Target 1": false,
@@ -351,7 +351,7 @@
                 "target": "_calibrator_name_",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 6,
+            "total_direction_type": 7,
             "Time averaging steps": "1",
             "Frequency averaging steps": "1",
             "parameterToSkip": []
@@ -418,7 +418,7 @@
                 "target": "_calibrator_name_",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 6,
+            "total_direction_type": 7,
             "Time averaging steps": "1",
             "Frequency averaging steps": "1",
             "parameterToSkip": []
@@ -476,7 +476,7 @@
                 "target": "3Cabc",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 3,
+            "total_direction_type": 4,
             "Time averaging steps": "4",
             "Time averaging steps demix": "8",
             "Frequency averaging steps": "16",
@@ -553,7 +553,7 @@
                 "target": "Paaa+01Paaa+02REF"
                 },
             "Calibrator Pipeline 2 Description": "Cal2 3Cdef/PP",
-            "total_direction_type": 5,
+            "total_direction_type": 6,
             "parameterToSkip": []
         },
         {
@@ -609,7 +609,7 @@
                 "target": "Paaa+01Paaa+02REF"
                 },
             "Calibrator Pipeline 2 Description": "Cal2 3Cdef/PP",
-            "total_direction_type": 5,
+            "total_direction_type": 6,
             "parameterToSkip": []
         }
     ],
@@ -636,7 +636,7 @@
                 },
             "Observation Short Description": "Baaaa+bb",
             "Pipeline Short Description": "Baaaa+bb/PULP",
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Duration": "00:02:00",
             "Optimise period & DM": false,
             "Subintegration time": "-1",
@@ -667,7 +667,7 @@
                 },
             "Observation Short Description": "Baaaa+bb",
             "Pipeline Short Description": "Baaaa+bb/PULP",
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Duration": "00:02:00",
             "Optimise period & DM": false,
             "Subintegration time": "-1",
@@ -698,7 +698,7 @@
                 "target": "FRB YYYYMMDDA",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Duration": "00:02:00",
             "Digifil options": {
                 "dm": "0.001",
@@ -735,7 +735,7 @@
                 "target": "Baaaa+bb",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Duration": "00:02:00",
             "Digifil options": {
                 "dm": "0",
@@ -769,7 +769,7 @@
                 "target": "Baaaa+bb",
                 "direction_type": "J2000"
                 },
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Duration": "00:02:00",
             "Digifil options": {
                 "dm": "0",
@@ -848,7 +848,7 @@
                 "direction_type": "J2000"
                 },
             "Run ADDER QA": true,
-            "total_direction_type": 6,
+            "total_direction_type": 7,
             "parameterToSkip": []
         },
         {
@@ -914,7 +914,7 @@
                 "direction_type": "J2000"
                 },
             "Run ADDER QA": true,
-            "total_direction_type": 6,
+            "total_direction_type": 7,
             "parameterToSkip": []
         }
     ],
@@ -946,7 +946,7 @@
                 "target": "target1",
                 "direction_type": "J2000"
             },
-            "total_direction_type": 2,
+            "total_direction_type": 3,
             "parameterToSkip": []
         }
     ],
@@ -980,7 +980,7 @@
             },
             "Observation Short Description":"Baaaa+bb",
             "Pipeline Short Description": "Baaaa+bb/PULP",
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Optimise period & DM": false,
             "Subintegration time": "-1",
             "parameterToSkip": []
@@ -1014,7 +1014,7 @@
             },
             "Observation Short Description":"Baaaa+bb",
             "Pipeline Short Description": "Baaaa+bb/PULP",
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "Optimise period & DM": false,
             "Subintegration time": "-1",
             "parameterToSkip": []
@@ -1048,7 +1048,7 @@
                 "target": "target1",
                 "direction_type": "J2000"
             },
-            "total_direction_type": 2,
+            "total_direction_type": 3,
             "parameterToSkip": ["Beamformers"]
         }
     ],
@@ -1085,7 +1085,7 @@
             "Pipeline Description": "_Triggered_Observation_Name_/TP",
             "Calibrator Observation Description": "_Calibrator_Name_",
             "Calibrator Pipeline Description": "_Calibrator_Name_/CP",
-            "total_direction_type": 2,
+            "total_direction_type": 3,
             "Target Duration": "7200",
             "parameterToSkip": ["Calibrator Name","Calibrator Observation Pointing","Calibrator Duration", "Station Groups - Target Observation"]
         }
@@ -1137,7 +1137,7 @@
                 "target": "target1",
                 "direction_type": "J2000"
             },
-            "total_direction_type": 4,
+            "total_direction_type": 5,
             "Calibrator 2 Duration": "600",
             "parameterToSkip": ["Station Groups - Target Observation"]
         }
@@ -1164,7 +1164,7 @@
                 "target": "NEP",
                 "direction_type": "J2000"
                 },        
-            "total_direction_type": 1,
+            "total_direction_type": 2,
             "parameterToSkip": []
         }
     ],
@@ -1194,7 +1194,7 @@
                 "target": "_target_name_",
                 "direction_type": "J2000"
                 },       
-        "total_direction_type": 2,
+        "total_direction_type": 3,
         "parameterToSkip": ["Beamformers"]
     },
     "Solar Campaign": {