#4141 Show selected item after expand all

Author: stroomdev66

stroom-core-client/src/main/java/stroom/explorer/client/presenter/ExplorerTreeModel.java

@@ -60,6 +60,7 @@ public class ExplorerTreeModel {
 
     private Integer minDepth = 1;
     private Set<ExplorerNodeKey> ensureVisible;
+    private ExplorerNode forceSelection;
     private boolean showAlerts = false;
 
     private FetchExplorerNodesRequest currentCriteria;
@@ -117,9 +118,13 @@ public void setRequiredPermissions(final String... requiredPermissions) {
         explorerTreeFilterBuilder.setRequiredPermissions(requiredPermissions);
     }
 
+    public void setForceSelection(final ExplorerNode forceSelection) {
+        this.forceSelection = forceSelection;
+    }
+
     public void setEnsureVisible(final Set<ExplorerNode> ensureVisible) {
         this.ensureVisible = null;
-        if (ensureVisible != null) {
+        if (ensureVisible != null && ensureVisible.size() > 0) {
             this.ensureVisible = new HashSet<>();
             for (ExplorerNode node : ensureVisible) {
                 if (node != null && node.getUniqueKey() != null) {
@@ -131,7 +136,7 @@ public void setEnsureVisible(final Set<ExplorerNode> ensureVisible) {
 
     public void setEnsureVisible(final ExplorerNode... ensureVisible) {
         this.ensureVisible = null;
-        if (ensureVisible != null) {
+        if (ensureVisible != null && ensureVisible.length > 0) {
             this.ensureVisible = new HashSet<>();
             for (ExplorerNode node : ensureVisible) {
                 if (node != null && node.getUniqueKey() != null) {
@@ -230,9 +235,11 @@ private void handleFetchResult(final FetchExplorerNodesRequest criteria,
             // Try and find the item we have asked to make visible first and if we can't find
             // that try and select one of the folders that has been forced open in an attempt to
             // make the requested item visible.
-            if (criteria.getEnsureVisible() != null && criteria.getEnsureVisible().size() > 0) {
+            ExplorerNode nextSelection = forceSelection;
+            if (nextSelection == null &&
+                    criteria.getEnsureVisible() != null &&
+                    criteria.getEnsureVisible().size() > 0) {
                 final ExplorerNodeKey uniqueKey = criteria.getEnsureVisible().iterator().next();
-                ExplorerNode nextSelection = null;
                 if (uniqueKey != null) {
                     nextSelection = ExplorerNode.builder()
                             .type(uniqueKey.getType())
@@ -269,10 +276,9 @@ private void handleFetchResult(final FetchExplorerNodesRequest criteria,
                     // that we get the latest version with any new name it might have.
                     nextSelection = rows.get(index);
                 }
-
-                if (nextSelection != null) {
-                    explorerTree.setInitialSelectedItem(nextSelection);
-                }
+            }
+            if (nextSelection != null) {
+                explorerTree.setInitialSelectedItem(nextSelection);
             }
 
             // We do not want the root to always be forced open.
@@ -283,6 +289,7 @@ private void handleFetchResult(final FetchExplorerNodesRequest criteria,
             // ensure visibility of. We can forget them now as we have a result that should have
             // opened required folders to make them visible.
             ensureVisible = null;
+            forceSelection = null;
 
             // We aren't loading any more.
             loading.setVisible(false);

stroom-core-client/src/main/java/stroom/explorer/client/presenter/NavigationPresenter.java

@@ -207,8 +207,14 @@ protected void onBind() {
             }
             locate.setEnabled(selectedDoc != null);
         }));
-        registerHandler(collapseAll.addClickHandler((e) -> explorerTree.getTreeModel().collapseAll()));
-        registerHandler(expandAll.addClickHandler((e) -> explorerTree.getTreeModel().expandAll()));
+        registerHandler(collapseAll.addClickHandler((e) -> {
+            explorerTree.getTreeModel().setForceSelection(explorerTree.getSelectionModel().getSelected());
+            explorerTree.getTreeModel().collapseAll();
+        }));
+        registerHandler(expandAll.addClickHandler((e) -> {
+            explorerTree.getTreeModel().setForceSelection(explorerTree.getSelectionModel().getSelected());
+            explorerTree.getTreeModel().expandAll();
+        }));
         registerHandler(locate.addClickHandler((e) -> LocateDocEvent.fire(this, selectedDoc)));
         registerHandler(find.addClickHandler((e) -> ShowFindInContentEvent.fire(this)));
         registerHandler(add.addClickHandler((e) -> newItem(add.getElement())));

unreleased_changes/20240301_225132_423__4141.md

@@ -0,0 +1,24 @@
+* Issue **#4141** : Show selected item after expand all.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Expand /Collapse All can't see currently highlighted Item
+# Issue link:  https://github.com/gchq/stroom/issues/4141
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```