diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c8364a24..6afe3b91 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Version History v7.1.6 ------ +* Make the SummaryState view as the official one for TTS and BTS. ``_ * Refactor get_jira_obs_report method to account for JIRA REST API user timezone. ``_ v7.1.5 diff --git a/manager/ui_framework/fixtures/initial_data_base.json b/manager/ui_framework/fixtures/initial_data_base.json index bbc16681..c1d4caa9 100644 --- a/manager/ui_framework/fixtures/initial_data_base.json +++ b/manager/ui_framework/fixtures/initial_data_base.json @@ -477,7 +477,7 @@ "fields": { "creation_timestamp": "2021-02-11T07:26:03.945541Z", "update_timestamp": "2022-04-13T21:22:24.863664Z", - "name": "SummaryState3", + "name": "SummaryState", "data": { "content": { "newPanel-1": { diff --git a/manager/ui_framework/fixtures/initial_data_tucson.json b/manager/ui_framework/fixtures/initial_data_tucson.json index c940fe55..8b330b19 100644 --- a/manager/ui_framework/fixtures/initial_data_tucson.json +++ b/manager/ui_framework/fixtures/initial_data_tucson.json @@ -477,7 +477,7 @@ "fields": { "creation_timestamp": "2021-02-11T07:26:03.945541Z", "update_timestamp": "2022-04-13T21:22:24.863664Z", - "name": "SummaryState2", + "name": "SummaryState", "data": { "content": { "newPanel-1": { @@ -493,6 +493,10 @@ "name": "WeatherForecast", "salindex": 0 }, + { + "name": "DREAM", + "salindex": 0 + }, { "name": "DIMM", "salindex": 1 @@ -513,6 +517,10 @@ "name": "EPM", "salindex": 1 }, + { + "name": "EAS", + "salindex": 0 + }, { "name": "ESS", "salindex": 1 @@ -611,6 +619,10 @@ "name": "OCPS", "salindex": 2 }, + { + "name": "OCPS", + "salindex": 101 + }, { "name": "Watcher", "salindex": 0 @@ -707,6 +719,40 @@ "name": "CCHeaderService", "salindex": 0 } + ], + "Calibration Systems": [ + { + "name": "CBP", + "salindex": 0 + }, + { + "name": "LEDProjector", + "salindex": 0 + }, + { + "name": "LinearStage", + "salindex": 101 + }, + { + "name": "LinearStage", + "salindex": 102 + }, + { + "name": "LinearStage", + "salindex": 103 + }, + { + "name": "LinearStage", + "salindex": 104 + }, + { + "name": "Electrometer", + "salindex": 101 + }, + { + "name": "Electrometer", + "salindex": 102 + } ] } }, @@ -777,6 +823,18 @@ "name": "ATSpectrograph", "salindex": 0 } + ], + "Calibration Systems": [ + { + "name": "Electrometer", + "salindex": 201 + } + ], + "Support & Monitoring": [ + { + "name": "ATBuilding", + "salindex": 0 + } ] } }, @@ -784,7 +842,7 @@ }, "content": "CSCSummary", "properties": { - "h": 28, + "h": 35, "i": 3, "w": 31, "x": 66,