Skip to content

improve SaR snapshot UI behavior #3595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
georgweiss merged 1 commit into from
Oct 22, 2025
Merged

improve SaR snapshot UI behavior #3595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions ...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,13 +757,18 @@ public void takeSnapshot() {
*/
private void resetMetaData() {
tabTitleProperty.setValue(Messages.unnamedSnapshot);
snapshotNameProperty.setValue(null);
snapshotCommentProperty.setValue(null);
createdDateTextProperty.setValue(null);
lastModifiedDateTextProperty.setValue(null);
createdByTextProperty.setValue(null);
}

public static Throwable getRootCause(Throwable throwable) {
if (throwable.getCause() != null)
return getRootCause(throwable.getCause());

return throwable;
}

@SuppressWarnings("unused")
public void saveSnapshot(ActionEvent actionEvent) {
disabledUi.set(true);
Expand Down Expand Up @@ -795,7 +800,8 @@ public void saveSnapshot(ActionEvent actionEvent) {
Platform.runLater(() -> {
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle(Messages.errorActionFailed);
alert.setContentText(e.getMessage());
// get root cause of exception because the nested exception names are not very friendly
alert.setContentText(getRootCause(e).getMessage());
alert.setHeaderText(Messages.saveSnapshotErrorContent);
DialogHelper.positionDialog(alert, borderPane, -150, -150);
alert.showAndWait();
Expand Down Expand Up @@ -1101,7 +1107,14 @@ private void takeSnapshotReadPVs(Consumer<Optional<Snapshot>> consumer) {
});
showTakeSnapshotResult(snapshotItems);
Snapshot snapshot = new Snapshot();
snapshot.setSnapshotNode(Node.builder().nodeType(NodeType.SNAPSHOT).build());
snapshot.setSnapshotNode(
Node.builder()
.nodeType(NodeType.SNAPSHOT)
// set name and description to preserve the name / comment fields
.name(snapshotNameProperty.getValue())
.description(snapshotCommentProperty.getValue())
.build()
);
SnapshotData snapshotData = new SnapshotData();
snapshotData.setSnapshotItems(snapshotItems);
snapshot.setSnapshotData(snapshotData);
Expand Down