Merge pull request #3184 from jeonghanlee/latched_enabled_to_command_…

…alarmLogTable Add the missing Latch status into the Alarm Logger History
ControlSystemStudio · Nov 21, 2024 · a296786 · a296786
2 parents 7ce4a9d + e98ae67
commit a296786
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...g-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java b/...g-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java
@@ -1,6 +1,7 @@
 package org.phoebus.applications.alarm.logging.ui;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.sun.jersey.api.client.WebResource;
@@ -40,6 +41,7 @@
 import org.phoebus.applications.alarm.AlarmSystem;
 import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 import org.phoebus.applications.alarm.model.SeverityLevel;
+import org.phoebus.applications.alarm.model.json.JsonModelReader;
 import org.phoebus.applications.alarm.ui.AlarmUI;
 import org.phoebus.framework.jobs.Job;
 import org.phoebus.framework.selection.SelectionService;
@@ -249,7 +251,17 @@ protected void updateItem(String item, boolean empty) {
                         if (!en) {
                             return new SimpleStringProperty("Disabled");
                         } else {
-                            return new SimpleStringProperty("Enabled");
+                            try {
+                                final JsonNode jsonNode = (JsonNode) JsonModelReader.parseJsonText(alarmMessage.getValue().getConfig_msg());
+                                if (jsonNode == null) {
+                                    logger.log(Level.WARNING, "There is no JasonNode");
+                                    return null;
+                                }
+                                final boolean latching = jsonNode.get("latching").asBoolean();
+                                return new SimpleStringProperty(latching ? "Enabled:Latched" : "Enabled:Unlatch");
+                            } catch (Exception e) {
+                                logger.log(Level.SEVERE, "Unexpected error in alarmMessage" + e);
+                            }
                         }
                     }
                     return null;