Improve search with multi type results

jeremytammik · Jan 29, 2025 · 9f2e2ef · 9f2e2ef
1 parent 0f68d17
commit 9f2e2ef
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/...evitLookup.UI.Playground/Mockups/Services/Decomposition/MockDecompositionSearchService.cs b/...evitLookup.UI.Playground/Mockups/Services/Decomposition/MockDecompositionSearchService.cs
@@ -36,7 +36,11 @@ public sealed class MockDecompositionSearchService : IDecompositionSearchService
         }
         finally
         {
-            if (selectedObject is not null)
+            if (query == string.Empty)
+            {
+                _previousSelection = null;
+            }
+            else if (selectedObject is not null)
             {
                 _previousSelection = selectedObject;
             }
@@ -113,10 +117,11 @@ private static List<ObservableDecomposedMember> FilterMembers(string query, List
 
     private ObservableDecomposedObject? FindPreviousSelectedType(List<ObservableDecomposedObject> decomposedObjects)
     {
+        if (_previousSelection is null) return null;
+
         ObservableDecomposedObject? fetchedObject = null;
         foreach (var decomposedObject in decomposedObjects)
         {
-            if (_previousSelection is null) break;
             if (decomposedObject.TypeFullName != _previousSelection.TypeFullName) continue;
             if (decomposedObject.Members.Count == 0) continue;
 

diff --git a/...ookup.UI.Playground/Mockups/ViewModels/Decomposition/MockDecompositionSummaryViewModel.cs b/...ookup.UI.Playground/Mockups/ViewModels/Decomposition/MockDecompositionSummaryViewModel.cs
@@ -123,6 +123,12 @@ async partial void OnSelectedDecomposedObjectChanged(ObservableDecomposedObject?
             if (value is null) return;
 
             await FetchMembersAsync(value);
+            if (FilteredDecomposedObjects.Count > 1)
+            {
+                value.FilteredMembers = value.Members;
+                return;
+            }
+
             value.FilteredMembers = searchService.SearchMembers(SearchText, value);
         }
         catch (Exception exception)

diff --git a/.../RevitLookup.UI.Playground/Mockups/ViewModels/Decomposition/MockEventsSummaryViewModel.cs b/.../RevitLookup.UI.Playground/Mockups/ViewModels/Decomposition/MockEventsSummaryViewModel.cs
@@ -124,6 +124,12 @@ async partial void OnSelectedDecomposedObjectChanged(ObservableDecomposedObject?
             if (value is null) return;
 
             await FetchMembersAsync(value);
+            if (FilteredDecomposedObjects.Count > 1)
+            {
+                value.FilteredMembers = value.Members;
+                return;
+            }
+
             value.FilteredMembers = searchService.SearchMembers(SearchText, value);
         }
         catch (Exception exception)

diff --git a/source/RevitLookup/Services/Decomposition/DecompositionSearchService.cs b/source/RevitLookup/Services/Decomposition/DecompositionSearchService.cs
@@ -36,7 +36,11 @@ public sealed class DecompositionSearchService : IDecompositionSearchService
         }
         finally
         {
-            if (selectedObject is not null)
+            if (query == string.Empty)
+            {
+                _previousSelection = null;
+            }
+            else if (selectedObject is not null)
             {
                 _previousSelection = selectedObject;
             }
@@ -113,10 +117,11 @@ private static List<ObservableDecomposedMember> FilterMembers(string query, List
 
     private ObservableDecomposedObject? FindPreviousSelectedType(List<ObservableDecomposedObject> decomposedObjects)
     {
+        if (_previousSelection is null) return null;
+
         ObservableDecomposedObject? fetchedObject = null;
         foreach (var decomposedObject in decomposedObjects)
         {
-            if (_previousSelection is null) break;
             if (decomposedObject.TypeFullName != _previousSelection.TypeFullName) continue;
             if (decomposedObject.Members.Count == 0) continue;
 

diff --git a/source/RevitLookup/ViewModels/Decomposition/DecompositionSummaryViewModel.cs b/source/RevitLookup/ViewModels/Decomposition/DecompositionSummaryViewModel.cs
@@ -120,6 +120,12 @@ async partial void OnSelectedDecomposedObjectChanged(ObservableDecomposedObject?
             if (value is null) return;
 
             await FetchMembersAsync(value);
+            if (FilteredDecomposedObjects.Count > 1)
+            {
+                value.FilteredMembers = value.Members;
+                return;
+            }
+
             value.FilteredMembers = searchService.SearchMembers(SearchText, value);
         }
         catch (InvalidObjectException exception)

diff --git a/source/RevitLookup/ViewModels/Decomposition/EventsSummaryViewModel.cs b/source/RevitLookup/ViewModels/Decomposition/EventsSummaryViewModel.cs
@@ -101,6 +101,12 @@ async partial void OnSelectedDecomposedObjectChanged(ObservableDecomposedObject?
             if (value is null) return;
 
             await FetchMembersAsync(value);
+            if (FilteredDecomposedObjects.Count > 1)
+            {
+                value.FilteredMembers = value.Members;
+                return;
+            }
+
             value.FilteredMembers = searchService.SearchMembers(SearchText, value);
         }
         catch (Exception exception)