CSSTUDIO-2167 Remove the ability to input PVs for decorations under "Advanced Search" in the Logbook application.

Author: abrahamwolk

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/AdvancedSearchViewController.java

@@ -64,9 +64,6 @@ public class AdvancedSearchViewController {
 
     static final Logger logger = Logger.getLogger(AdvancedSearchViewController.class.getName());
 
-    @FXML
-    public VBox decorationInputNodesVBox;
-
     @FXML
     Label levelLabel;
 
@@ -116,18 +113,14 @@ public class AdvancedSearchViewController {
     private final SimpleBooleanProperty sortAscending = new SimpleBooleanProperty(false);
     private final SimpleBooleanProperty requireAttachments = new SimpleBooleanProperty(false);
 
-    private List<Node> decorationInputNodes;
-
     private Runnable searchCallback = () -> {
         throw new IllegalStateException("Search callback is not set on AdvancedSearchViewController!");
     };
 
     public AdvancedSearchViewController(LogClient logClient,
-                                        SearchParameters searchParameters,
-                                        List<Node> decorationInputNodes) {
+                                        SearchParameters searchParameters) {
         this.logClient = logClient;
         this.searchParameters = searchParameters;
-        this.decorationInputNodes = decorationInputNodes;
     }
 
     public void setSearchCallback(Runnable searchCallback) {
@@ -305,10 +298,6 @@ public void initialize() {
         sortDescRadioButton.setOnAction(ae -> sortAscending.set(false));
 
         sortAscRadioButton.setOnAction(ae -> sortAscending.set(true));
-
-        if (decorationInputNodes != null) {
-            decorationInputNodesVBox.getChildren().addAll(decorationInputNodes);
-        }
     }
 
     public AnchorPane getPane() {

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTable.java

@@ -66,7 +66,7 @@ public LogEntryTable(final LogEntryTableApp app) {
                             logEntryTableViewController.setDecorations(decorations);
                             return logEntryTableViewController;
                         } else if (clazz.isAssignableFrom(AdvancedSearchViewController.class)) {
-                            return clazz.getConstructor(LogClient.class, SearchParameters.class, List.class).newInstance(app.getClient(), searchParameters, decorations.stream().map(decoration -> decoration.getDecorationInputNode()).toList());
+                            return clazz.getConstructor(LogClient.class, SearchParameters.class).newInstance(app.getClient(), searchParameters);
                         } else if (clazz.isAssignableFrom(SingleLogEntryDisplayController.class)) {
                             SingleLogEntryDisplayController singleLogEntryDisplayController = (SingleLogEntryDisplayController) clazz.getConstructor(LogClient.class).newInstance(app.getClient());
                             singleLogEntryDisplayController.setSelectLogEntryInUI(id -> goBackAndGoForwardActions.loadLogEntryWithID(id));

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/spi/Decoration.java

@@ -6,8 +6,6 @@
 import java.util.List;
 
 public interface Decoration {
-    public Node getDecorationInputNode();
-
     public void setLogEntries(List<LogEntry> logEntries);
 
     public void setRefreshLogEntryTableView(Runnable refreshLogEntryTableView);

app/logbook/olog/ui/src/main/resources/org/phoebus/logbook/olog/ui/AdvancedSearchView.fxml

@@ -120,8 +120,7 @@
                             <Insets />
                         </GridPane.margin>
                     </Label>
-                    <TextField fx:id="attachmentTypes" GridPane.columnSpan="2" GridPane.rowIndex="18"/>
-                    <VBox fx:id="decorationInputNodesVBox" GridPane.columnSpan="2" GridPane.rowIndex="19" />
+                    <TextField fx:id="attachmentTypes" GridPane.columnSpan="2" GridPane.rowIndex="18" />
                 </children>
             </GridPane>
         </children>