Skip to content

Allow expansion of save&restore composite snapshot node #3963

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
shroffk merged 1 commit into from
Oct 16, 2026
Merged

Allow expansion of save&restore composite snapshot node #3963

Show file tree
Hide file tree
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
Binary file added app/save-and-restore/app/doc/images/composite-snapshot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions ...pp/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,18 @@ private String getSavedFilterName() {
* @param targetItem {@link TreeItem<Node>} on which the operation is performed.
*/
protected void expandTreeNode(TreeItem<Node> targetItem) {
List<Node> childNodes = saveAndRestoreService.getChildNodes(targetItem.getValue());
List<Node> childNodes;
if(targetItem.getValue().getNodeType().equals(NodeType.COMPOSITE_SNAPSHOT)){
try {
childNodes = saveAndRestoreService.getCompositeSnapshotNodes(targetItem.getValue().getUniqueId());
} catch (Exception e) {
ExceptionDetailsErrorDialog.openError(treeTableView, Messages.errorGeneric, Messages.errorUnableToRetrieveData, e);
return;
}
}
else{
childNodes = saveAndRestoreService.getChildNodes(targetItem.getValue());
}
List<TreeItem<Node>> list =
childNodes.stream().map(this::createTreeItem).toList();
targetItem.getChildren().setAll(list);
Expand Down Expand Up @@ -745,7 +756,7 @@ private TreeItem<Node> createTreeItem(final Node node) {
return new TreeItem<>(node) {
@Override
public boolean isLeaf() {
return node.getNodeType().equals(NodeType.SNAPSHOT) || node.getNodeType().equals(NodeType.COMPOSITE_SNAPSHOT);
return node.getNodeType().equals(NodeType.SNAPSHOT);
}
};
}
Expand Down
Loading