Skip to content

Commit adcfec5

Browse files
committed
Show error dialog if search params are invalid
1 parent e12e93c commit adcfec5

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,14 @@ private SearchResult findLogs(MultivaluedMap<String, String> searchParams) throw
260260
.build();
261261
try {
262262
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
263-
OlogSearchResult searchResult = OlogObjectMappers.logEntryDeserializer.readValue(response.body(), OlogSearchResult.class);
264-
return SearchResult.of(new ArrayList<>(searchResult.getLogs()),
265-
searchResult.getHitCount());
263+
if(response.statusCode() == 200) {
264+
OlogSearchResult searchResult = OlogObjectMappers.logEntryDeserializer.readValue(response.body(), OlogSearchResult.class);
265+
return SearchResult.of(new ArrayList<>(searchResult.getLogs()),
266+
searchResult.getHitCount());
267+
}
268+
else{
269+
throw new RuntimeException(response.body());
270+
}
266271
} catch (Exception e) {
267272
LOGGER.log(Level.WARNING, "failed to retrieve log entries", e);
268273
throw new RuntimeException(e);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.phoebus.logbook.SearchResult;
3535
import org.phoebus.logbook.olog.ui.query.OlogQuery;
3636
import org.phoebus.logbook.olog.ui.query.OlogQueryManager;
37+
import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
3738

3839
import java.net.URL;
3940
import java.time.LocalDateTime;
@@ -262,7 +263,8 @@ public void search() {
262263
},
263264
(msg, ex) -> {
264265
searchInProgress.set(false);
265-
});
266+
ExceptionDetailsErrorDialog.openError(agenda, Messages.SearchFailed, "", ex);
267+
});
266268
}
267269

268270
public String getQuery() {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javafx.scene.control.Pagination;
2626
import javafx.scene.control.ProgressIndicator;
2727
import javafx.scene.control.SelectionMode;
28+
import javafx.scene.control.SplitPane;
2829
import javafx.scene.control.TableCell;
2930
import javafx.scene.control.TableColumn;
3031
import javafx.scene.control.TableView;
@@ -60,6 +61,7 @@
6061
import org.phoebus.security.store.SecureStore;
6162
import org.phoebus.security.tokens.ScopedAuthenticationToken;
6263
import org.phoebus.ui.dialog.DialogHelper;
64+
import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
6365

6466
import java.io.IOException;
6567
import java.util.ArrayList;
@@ -88,6 +90,10 @@ public class LogEntryTableViewController extends LogbookSearchController impleme
8890
@SuppressWarnings("unused")
8991
private GridPane viewSearchPane;
9092

93+
@SuppressWarnings("unused")
94+
@FXML
95+
private SplitPane splitPane;
96+
9197
// elements related to the table view of the log entries
9298
@FXML
9399
@SuppressWarnings("unused")
@@ -420,6 +426,7 @@ public void search() {
420426
},
421427
(msg, ex) -> {
422428
searchInProgress.set(false);
429+
ExceptionDetailsErrorDialog.openError(splitPane, Messages.SearchFailed, "", ex);
423430
});
424431
}
425432

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class Messages
5555
PreviewOpenErrorTitle,
5656
ReplyToLogEntry,
5757
RequestTooLarge,
58+
SearchFailed,
5859
SelectFile,
5960
SelectFolder,
6061
ShowHideDetails,

app/logbook/olog/ui/src/main/resources/org/phoebus/logbook/olog/ui/messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ ScalingFactor=Scaling Factor
9494
SearchButtonText=Search:
9595
Search=Search available:
9696
SearchAvailableItems=Search the list of available items.
97+
SearchFailed=Search Failed
9798
SearchToolTip=Edit and press Enter to search
9899
Selected=Selected
99100
SelectFolder=Select Folder

0 commit comments

Comments
 (0)