From 7e11a51551f49f893d10fce6c306ce8e1c60db2b Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Fri, 15 Mar 2024 10:04:26 +0100 Subject: [PATCH 1/2] CSSTUDIO-2044 Bugfix: run the correct search query when selecting "Alarm History" in the context menu of a widget in an OPI. --- .../applications/alarm/logging/ui/AlarmLogTable.java | 6 +++++- .../applications/alarm/logging/ui/AlarmLogTableApp.java | 4 ++-- .../alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTable.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTable.java index 00d71a545d..9f5c368262 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTable.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTable.java @@ -23,7 +23,8 @@ public class AlarmLogTable implements AppInstance { private DockItem tab; private AlarmLogTableController controller; - AlarmLogTable(final AlarmLogTableApp app) { + AlarmLogTable(final AlarmLogTableApp app, URI resource) { + // If URI resource == null, the default search query is used. this.app = app; try { ResourceBundle resourceBundle = NLS.getMessages(Messages.class); @@ -50,6 +51,9 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){ tab.setOnClosed(event -> { controller.shutdown(); }); + if (resource != null) { + setPVResource(resource); + } DockPane.getActiveDockPane().addTab(tab); } catch (IOException e) { Logger.getLogger(getClass().getName()).log(Level.WARNING, "Cannot load UI", e); diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java index 2824d097cd..d993899da6 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java @@ -40,7 +40,7 @@ public String getName() { @Override public AppInstance create() { - return new AlarmLogTable(this); + return new AlarmLogTable(this, null); } /** @@ -50,7 +50,7 @@ public AppInstance create() { */ @Override public AppInstance create(URI resource) { - AlarmLogTable alarmLogTable = new AlarmLogTable(this); + AlarmLogTable alarmLogTable = new AlarmLogTable(this, resource); //alarmLogTable.s return alarmLogTable; } diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java index e36018e303..0c43b460f2 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java @@ -41,9 +41,8 @@ public void call(Selection selection) throws URISyntaxException { selection.getSelections().stream().forEach(s -> { AdapterService.adapt(s, ProcessVariable.class).ifPresent(selectedPvs::add); }); - AlarmLogTable table = ApplicationService.createInstance(AlarmLogTableApp.NAME); URI uri = new URI(AlarmLogTableApp.SUPPORTED_SCHEMA, "", "", "pv="+selectedPvs.stream().map(ProcessVariable::getName).collect(Collectors.joining(",")), ""); - table.setPVResource(uri); + AlarmLogTable table = ApplicationService.createInstance(AlarmLogTableApp.NAME, uri); } @Override From eeee966f1dd912896a3d20f4debe7522a31b7d26 Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Fri, 15 Mar 2024 10:05:24 +0100 Subject: [PATCH 2/2] Remove commented-out code. --- .../phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java index d993899da6..c7421c9afb 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableApp.java @@ -51,7 +51,6 @@ public AppInstance create() { @Override public AppInstance create(URI resource) { AlarmLogTable alarmLogTable = new AlarmLogTable(this, resource); - //alarmLogTable.s return alarmLogTable; }