Add PV for the web dashboard to get current config details

block_server.py

@@ -76,7 +76,7 @@
 CONFIG_PUSH_TIME = 300  # 5 minutes
 INST_SCRIPT_PUSH_TIME = 604800  # 7 days
 
 # This IOC gets special treatment as it needs to be reloaded on every single config change, regardless of whether
 # it's macros have changed or not. For details see https://github.com/ISISComputingGroup/IBEX/issues/5590
 CAEN_DISCRIMINATOR_IOC_NAME = "CAENV895_01"
 
@@ -84,7 +84,7 @@
 initial_dbs = {
     BlockserverPVNames.BLOCKNAMES: char_waveform(16000),
     BlockserverPVNames.HEARTBEAT: {"type": "int", "count": 1, "value": [0]},
-    BlockserverPVNames.BLOCK_DETAILS: char_waveform(16000),
+    BlockserverPVNames.WD_CONF_DETAILS: char_waveform(16000),
     BlockserverPVNames.GROUPS: char_waveform(16000),
     BlockserverPVNames.COMPS: char_waveform(16000),
     BlockserverPVNames.LOAD_CONFIG: char_waveform(1000),
@@ -116,7 +116,7 @@
 class BlockServer(Driver):
     """The class for handling all the static PV access and monitors etc."""
 
     def __init__(self, ca_server):
         """Constructor.
 
         Args:
@@ -192,7 +192,7 @@
             self._config_list = ConfigListManager(self, ConfigurationFileManager())
         except Exception as err:
             print_and_log(
                 "Error creating inactive config list. Configuration list changes will not be stored "
                 + "in version control: %s " % str(err),
                 "MINOR",
             )
@@ -214,7 +214,7 @@
         )
         self._component_switcher.create_monitors()
 
     def initialise_configserver(self, facility):
         """Initialises the ActiveConfigHolder.
 
         Args:
@@ -262,14 +262,14 @@
             self._active_configserver.clear_config()
             self._initialise_config()
 
     def read(self, reason):
         """A method called by SimpleServer when a PV is read from the BlockServer over Channel Access.
 
         Args:
             reason (string): The PV that is being requested (without the PV prefix)
 
         Returns:
             string : A compressed and hexed JSON formatted string that gives the desired information based on reason.
             If an Exception is thrown in the reading of the information this is returned in compressed and hexed JSON.
         """
         try:
@@ -465,6 +465,7 @@
         self.update_blocks_monitors()
 
         self.update_get_details_monitors()
+        self.update_wd_details_monitors()
         self.update_curr_config_name_monitors()
         self._active_configserver.update_archiver(full_init)
         for handler in self.on_the_fly_handlers:
@@ -656,6 +657,15 @@
             )
             self.updatePVs()
 
+    def update_wd_details_monitors(self):
+        """Updates the monitor for the active configuration, so the web dashboard can see any changes."""
+        with self.monitor_lock:
+            config_details_json = convert_to_json({k: v for k, v in self._active_configserver.get_config_details(exclude_macros=True).items() if k not in ["component_iocs", "iocs"]})
+            self.setParam(
+                BlockserverPVNames.WD_CONF_DETAILS, compress_and_hex(config_details_json)
+            )
+            self.updatePVs()
+
     def update_curr_config_name_monitors(self):
         """Updates the monitor for the active configuration name, so the clients can see any changes."""
         with self.monitor_lock:

server_common/pv_names.py

@@ -46,7 +46,7 @@ class BlockserverPVNames:
     """Holds and manages blockserver PV names"""
 
     BLOCKNAMES = prepend_blockserver("BLOCKNAMES")
-    BLOCK_DETAILS = prepend_blockserver("BLOCK_DETAILS")
+    WD_CONF_DETAILS = prepend_blockserver("WD_CONF_DETAILS")
     BLOCK_RULES = prepend_blockserver("BLOCK_RULES")
     GROUPS = prepend_blockserver("GROUPS")
     GROUP_RULES = prepend_blockserver("GROUP_RULES")