Merge pull request #2318 from ControlSystemStudio/CSSTUDIO-1719

refactor: changing advanced search view parameters updates search

Author: georgweiss

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

@@ -21,10 +21,17 @@
 import com.google.common.base.Strings;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -105,26 +112,45 @@ public class AdvancedSearchViewController {
     private final SimpleBooleanProperty sortAscending = new SimpleBooleanProperty(false);
     private final SimpleBooleanProperty requireAttachments = new SimpleBooleanProperty(false);
 
+    private Runnable searchCallback = () -> {
+        throw new IllegalStateException("Search callback is not set on AdvancedSearchViewConroller!");
+    };
+
     public AdvancedSearchViewController(LogClient logClient, SearchParameters searchParameters) {
         this.logClient = logClient;
         this.searchParameters = searchParameters;
     }
 
+    public void setSearchCallback(Runnable searchCallback) {
+        this.searchCallback = searchCallback;
+    }
+
     @FXML
     public void initialize() {
 
         searchTitle.textProperty().bindBidirectional(this.searchParameters.titleProperty());
+        searchTitle.setOnKeyReleased(this::searchOnEnter);
         searchText.textProperty().bindBidirectional(this.searchParameters.textProperty());
+        searchText.setOnKeyReleased(this::searchOnEnter);
         searchAuthor.textProperty().bindBidirectional(this.searchParameters.authorProperty());
+        searchAuthor.setOnKeyReleased(this::searchOnEnter);
         levelSelector.valueProperty().bindBidirectional(this.searchParameters.levelProperty());
+        levelSelector.setOnAction(e -> searchCallback.run());
         searchTags.textProperty().bindBidirectional(this.searchParameters.tagsProperty());
+        searchParameters.tagsProperty().addListener(searchOnTextChange);
         searchLogbooks.textProperty().bindBidirectional(this.searchParameters.logbooksProperty());
+        searchParameters.logbooksProperty().addListener(searchOnTextChange);
         startTime.textProperty().bindBidirectional(this.searchParameters.startTimeProperty());
+        startTime.setOnKeyReleased(this::searchOnEnter);
         endTime.textProperty().bindBidirectional(this.searchParameters.endTimeProperty());
+        endTime.setOnKeyReleased(this::searchOnEnter);
         searchParameters.addListener((observable, oldValue, newValue) -> {
             updateControls(newValue);
         });
+        sortAscending.addListener(searchOnSortChange);
+
         attachmentTypes.textProperty().bindBidirectional(this.searchParameters.attachmentsProperty());
+        attachmentTypes.setOnKeyReleased(this::searchOnEnter);
 
         levelLabel.setText(LogbookUIPreferences.level_field_name);
 
@@ -160,6 +186,7 @@ public void initialize() {
                 }
                 if (timeSearchPopover.isShowing())
                     timeSearchPopover.hide();
+                searchCallback.run();
             });
         });
         Button cancel = new Button();
@@ -345,4 +372,19 @@ protected List<String> getValidatedTagsSelection(String tags) {
     public SimpleBooleanProperty getSortAscending(){
         return sortAscending;
     }
+
+    private void searchOnEnter(KeyEvent e) {
+        if (e.getCode() == KeyCode.ENTER) {
+            searchCallback.run();
+        }
+    }
+
+    private final ChangeListener<? super String> searchOnTextChange = (options, oldValue, newValue) -> {
+        searchCallback.run();
+    };
+
+    private final ChangeListener<? super Boolean> searchOnSortChange = (options, oldValue, newValue) -> {
+        searchCallback.run();
+    };
+
 }

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

@@ -2,6 +2,7 @@
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Alert;
+import org.phoebus.framework.nls.NLS;
 import org.phoebus.framework.persistence.Memento;
 import org.phoebus.framework.spi.AppDescriptor;
 import org.phoebus.framework.spi.AppInstance;
@@ -13,6 +14,7 @@
 import org.phoebus.ui.docking.DockPane;
 
 import java.io.IOException;
+import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +35,9 @@ public class LogEntryCalender implements AppInstance {
             SearchParameters searchParameters = new SearchParameters();
             searchParameters.setQuery(ologQueryManager.getQueries().get(0).getQuery());
             FXMLLoader loader = new FXMLLoader();
+            ResourceBundle resourceBundle = NLS.getMessages(Messages.class);
             loader.setLocation(this.getClass().getResource("LogEntryCalenderView.fxml"));
+            loader.setResources(resourceBundle);
             loader.setControllerFactory(clazz -> {
                 try {
                     if(app.getClient() != null)

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

@@ -97,6 +97,8 @@ public LogEntryCalenderViewController(LogClient logClient, OlogQueryManager olog
 
     @FXML
     public void initialize() {
+
+        advancedSearchViewController.setSearchCallback(this::search);
         configureComboBox();
         // Set the search parameters in the advanced search controller so that it operates on the same object.
         ologQueries.setAll(ologQueryManager.getQueries());

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

@@ -132,6 +132,9 @@ public LogEntryTableViewController(LogClient logClient, OlogQueryManager ologQue
 
     @FXML
     public void initialize() {
+
+        advancedSearchViewController.setSearchCallback(this::search);
+
         configureComboBox();
         ologQueries.setAll(ologQueryManager.getQueries());