Merge pull request #665 from SMI/feature/fix-selected-obj-after-remove

fixed index preservation after node removals in is identifiable reviewer
SMI · Mar 12, 2021 · 934c82e · 934c82e
2 parents ca76f34 + 412d240
commit 934c82e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/news/665-bugfix.md b/news/665-bugfix.md
@@ -0,0 +1 @@
+Fixed tree view loosing selected index when updating/ignoring a failure (in tree view)
diff --git a/src/applications/Applications.IsIdentifiableReviewer/Views/RulesView.cs b/src/applications/Applications.IsIdentifiableReviewer/Views/RulesView.cs
@@ -218,8 +218,31 @@ private void Ignore(OutstandingFailureNode ofn, bool isBulkIgnore)
         /// <param name="obj"></param>
         private void Remove(ITreeNode obj)
         {
-            _treeView.GetParent(obj)?.Children?.Remove(obj);
-            _treeView.RefreshObject(obj,true);
+            var siblings = _treeView.GetParent(obj)?.Children;
+
+            if(siblings == null)
+            {
+                return;
+            }
+
+            var idxToRemove = siblings.IndexOf(obj);
+
+            if(idxToRemove == -1)
+            {
+                return;
+            }
+
+
+            // remove us
+            siblings.Remove(obj);
+
+            // but preserve the selected index
+            if (idxToRemove < siblings.Count)
+            {
+                _treeView.SelectedObject = siblings[idxToRemove];
+            }
+
+            _treeView.RefreshObject(obj, true);
         }