Update advanced search to use server side levels data

Author: georgweiss

app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/OlogHttpClient.java

@@ -13,6 +13,7 @@
 import org.phoebus.logbook.LogClient;
 import org.phoebus.logbook.LogEntry;
 import org.phoebus.logbook.LogEntryChangeHandler;
+import org.phoebus.logbook.LogEntryLevel;
 import org.phoebus.logbook.LogTemplate;
 import org.phoebus.logbook.Logbook;
 import org.phoebus.logbook.LogbookException;
@@ -551,7 +552,7 @@ public LogTemplate saveTemplate(LogTemplate template) throws LogbookException {
     }
 
     @Override
-    public Collection<org.phoebus.logbook.Level> getLevels(){
+    public Collection<LogEntryLevel> getLogEntryLevels(){
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(Preferences.olog_url + "/levels"))
                 .GET()
@@ -560,7 +561,7 @@ public Collection<org.phoebus.logbook.Level> getLevels(){
         try {
             HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
             return OlogObjectMappers.logEntryDeserializer.readValue(
-                    response.body(), new TypeReference<Set<org.phoebus.logbook.Level>>() {
+                    response.body(), new TypeReference<Set<LogEntryLevel>>() {
                     });
         } catch (Exception e) {
             LOGGER.log(Level.WARNING, "Unable to get templates from service", e);

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

@@ -165,7 +165,9 @@ public void initialize() {
         configureComboBox();
         ologQueries.setAll(ologQueryManager.getQueries());
 
-        searchParameters.addListener((observable, oldValue, newValue) -> query.getEditor().setText(newValue));
+        searchParameters.addListener((observable, oldValue, newValue) -> {
+            query.getEditor().setText(newValue);
+        });
 
         tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 

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

@@ -43,7 +43,7 @@ public class SearchParameters implements ObservableValue<String> {
     private SimpleStringProperty title = new SimpleStringProperty();
     private SimpleStringProperty text = new SimpleStringProperty();
     private SimpleStringProperty author = new SimpleStringProperty();
-    private SimpleStringProperty level = new SimpleStringProperty();
+    private SimpleStringProperty levels = new SimpleStringProperty();
     private SimpleStringProperty tags = new SimpleStringProperty();
     private SimpleStringProperty logbooks = new SimpleStringProperty();
     private SimpleStringProperty startTime = new SimpleStringProperty();
@@ -74,7 +74,7 @@ public SearchParameters() {
             updateMap(Keys.OWNER, newValue);
             notifyListeners();
         });
-        level.addListener((observable, oldValue, newValue) -> {
+        levels.addListener((observable, oldValue, newValue) -> {
             updateMap(Keys.LEVEL, newValue);
             notifyListeners();
         });
@@ -106,7 +106,7 @@ private void updateMap(Keys key, String newValue) {
         } else {
             searchParameters.put(key, newValue);
         }
-        notifyListeners();
+        //notifyListeners();
     }
 
     public void addListener(InvalidationListener listener) {
@@ -149,8 +149,8 @@ public SimpleStringProperty authorProperty() {
         return author;
     }
 
-    public SimpleStringProperty levelProperty() {
-        return level;
+    public SimpleStringProperty levelsProperty() {
+        return levels;
     }
 
     public SimpleStringProperty tagsProperty() {
@@ -203,9 +203,9 @@ public void setQuery(String query) {
             textProperty().setValue(null);
         }
         if (map.containsKey(Keys.LEVEL.getName())) {
-            levelProperty().setValue(map.get(Keys.LEVEL.getName()));
+            levelsProperty().setValue(map.get(Keys.LEVEL.getName()));
         } else {
-            levelProperty().setValue(null);
+            levelsProperty().setValue(null);
         }
         if (map.containsKey(Keys.TAGS.getName())) {
             tagsProperty().setValue(map.get(Keys.TAGS.getName()));

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

@@ -61,6 +61,7 @@
 import org.phoebus.framework.selection.SelectionService;
 import org.phoebus.logbook.LogClient;
 import org.phoebus.logbook.LogEntry;
+import org.phoebus.logbook.LogEntryLevel;
 import org.phoebus.logbook.LogFactory;
 import org.phoebus.logbook.LogService;
 import org.phoebus.logbook.LogTemplate;
@@ -824,9 +825,9 @@ private void getServerSideStaticData() {
 
             templatesProperty.setAll(logClient.getTemplates().stream().toList());
 
-            Collection<org.phoebus.logbook.Level> levels = logClient.getLevels();
-            availableLevels.setAll(levels.stream().map(org.phoebus.logbook.Level::name).sorted().toList());
-            Optional<org.phoebus.logbook.Level> optionalLevel = levels.stream().filter(org.phoebus.logbook.Level::defaultLevel).findFirst();
+            Collection<LogEntryLevel> levels = logClient.getLogEntryLevels();
+            availableLevels.setAll(levels.stream().map(LogEntryLevel::name).sorted().toList());
+            Optional<LogEntryLevel> optionalLevel = levels.stream().filter(LogEntryLevel::defaultLevel).findFirst();
             String defaultLevel = null;
             if(optionalLevel.isPresent()){
                 // One level value should be the default level
@@ -906,7 +907,7 @@ public Optional<LogEntry> getLogEntryResult() {
      * Loads template to configure UI elements.
      *
      * @param logTemplate A {@link LogTemplate} selected by user. If <code>null</code>, all log entry elements
-     *                    will be cleared, except the Level selector, which will be set to the top-most item.
+     *                    will be cleared, except the LogEntryLevel selector, which will be set to the top-most item.
      */
     private void loadTemplate(LogTemplate logTemplate) {
         if (logTemplate != null) {

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java

@@ -11,7 +11,7 @@ default_logbook_query=desc=*&start=12 hours&end=now
 # Stylesheet for the items in the log calendar view
 calendar_view_item_stylesheet=Agenda.css
 
-# Text to render for the "Level" field of a log entry. Sites may wish to customize this with respect to
+# Text to render for the "LogEntryLevel" field of a log entry. Sites may wish to customize this with respect to
 # its wording and its implied purpose.
 level_field_name=Level:
 

app/logbook/olog/ui/src/main/resources/log_olog_ui_preferences.properties

@@ -23,10 +23,10 @@
   ~  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   -->
 
-<AnchorPane fx:id="advancedSearchPane" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.phoebus.logbook.olog.ui.AdvancedSearchViewController">
+<AnchorPane fx:id="advancedSearchPane" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.phoebus.logbook.olog.ui.AdvancedSearchViewController">
 
         <children>
-            <GridPane layoutX="18.0" layoutY="95.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <GridPane fx:id="gridPane" layoutX="18.0" layoutY="95.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                 <columnConstraints>
                     <ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -67,7 +67,16 @@
                     <Label text="%Text" GridPane.rowIndex="3" />
                     <TextField fx:id="searchText" GridPane.columnSpan="2" GridPane.rowIndex="4" />
                     <Label fx:id="levelLabel" text="Level:" GridPane.rowIndex="5" />
-                    <ComboBox fx:id="levelSelector" prefWidth="150.0" GridPane.columnSpan="2" GridPane.rowIndex="6" />
+                    <!--<ComboBox fx:id="levelSelector" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnSpan="2" GridPane.rowIndex="6" />-->
+                    <HBox maxWidth="1.7976931348623157E308" GridPane.columnSpan="2" GridPane.rowIndex="6">
+                        <children>
+                            <TextField fx:id="selectedLevelsField" editable="false" HBox.hgrow="ALWAYS">
+                     <HBox.margin>
+                        <Insets right="5.0" />
+                     </HBox.margin></TextField>
+                            <ToggleButton fx:id="levelsToggleButton" onAction="#selectLevels" />
+                        </children>
+                    </HBox>
                     <Label text="%Logbooks" GridPane.rowIndex="7" />
                     <TextField fx:id="searchLogbooks" editable="false" GridPane.columnSpan="2" GridPane.rowIndex="8" />
                     <Label text="%Tags" GridPane.rowIndex="9" />

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

@@ -11,6 +11,6 @@ default_logbook_query=search=*&start=12 hours&end=now
 # Stylesheet for the items in the log calendar view
 calendar_view_item_stylesheet=Agenda.css
 
-# Text to render for the "Level" field of a log entry. Sites may wish to customize this with respect to
+# Text to render for the "LogEntryLevel" field of a log entry. Sites may wish to customize this with respect to
 # its wording and its implied purpose.
 level_field_name=Level:

app/logbook/ui/src/main/resources/log_ui_preferences.properties

@@ -6,7 +6,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author Eric Berryman taken from shroffk
@@ -531,7 +530,10 @@ default LogTemplate saveTemplate(LogTemplate logTemplate) throws LogbookExceptio
         return null;
     }
 
-    default Collection<Level> getLevels(){
+    /**
+     * @return List of {@link LogEntryLevel}s maintained in the service
+     */
+    default Collection<LogEntryLevel> getLogEntryLevels(){
         return Collections.emptySet();
     }
 }

core/logbook/src/main/java/org/phoebus/logbook/LogClient.java

@@ -11,5 +11,5 @@
  *                     default level. Server will ensure only one single
  *                     level is maintained as the default level.
  */
-public record Level(String name, boolean defaultLevel) {
+public record LogEntryLevel(String name, boolean defaultLevel) {
 }