Add number of matched elements when filtering

enso-org · Mar 4, 2025 · b97556d · b97556d
1 parent 8319329
commit b97556d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/gui/integration-test/project-view/componentBrowser.spec.ts b/app/gui/integration-test/project-view/componentBrowser.spec.ts
@@ -202,6 +202,8 @@ test('Filtering list', async ({ page }) => {
   await expect(segments).toHaveText(['Data.', 're', 'ad', '_te', 'xt'])
   const highlighted = locate.componentBrowserEntry(page).locator('.component-label-segment.match')
   await expect(highlighted).toHaveText(['re', '_te'])
+  // Filtered-out group are hidden, and the rest displays number of matched elements.
+  await expect(page.locator('.groupEntry')).toHaveText(['all (1)', 'Input (1)'])
 })
 
 test('Navigating groups', async ({ page }) => {

diff --git a/app/gui/src/project-view/components/ComponentBrowser/ComponentList.vue b/app/gui/src/project-view/components/ComponentBrowser/ComponentList.vue
@@ -5,7 +5,7 @@ import type { Filtering } from '@/components/ComponentBrowser/filtering'
 import SvgIcon from '@/components/SvgIcon.vue'
 import VirtualizedList from '@/components/VirtualizedList.vue'
 import { groupColorStyle } from '@/composables/nodeColors'
-import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
+import { GroupInfo, useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { tryGetIndex } from '@/util/data/array'
 import { computed, ref, toRef, watch } from 'vue'
 import type { ComponentExposed } from 'vue-component-type-helpers'
@@ -48,11 +48,12 @@ watch(selectedGroupIndex, () => (selectedComponentIndex.value = 0))
 const suggestionDbStore = useSuggestionDbStore()
 const components = computed(() => makeComponentList(suggestionDbStore.entries, props.filtering))
 const currentGroups = computed(() => {
-  return Array.from(components.value.keys(), (id) => ({
+  return Array.from(components.value.entries(), ([id, components]) => ({
     id,
     ...(id === 'all' ? { name: 'all' }
     : id === 'suggestions' ? { name: 'suggestions' }
     : (suggestionDbStore.groups[id] ?? { name: 'unknown' })),
+    ...(props.filtering.pattern != null ? { displayedNumber: components.length } : {}),
   }))
 })
 const displayedGroupId = computed(() =>
@@ -111,7 +112,9 @@ defineExpose({
       :debounceMouseSelection="MOUSE_SELECTION_DEBOUNCE"
     >
       <div class="groupEntry">
-        <span class="groupEntryLabel">{{ group.name }}</span>
+        <span class="groupEntryLabel">
+          {{ group.name }}{{ group.displayedNumber ? ` (${group.displayedNumber})` : '' }}
+        </span>
         <SvgIcon v-if="selected" class="groupEntryIcon" name="folder_closed" />
       </div>
     </VirtualizedList>

diff --git a/app/gui/src/project-view/components/ComponentBrowser/filtering.ts b/app/gui/src/project-view/components/ComponentBrowser/filtering.ts
@@ -244,7 +244,7 @@ export class Filtering {
     public currentModule: ProjectPath | undefined = undefined,
   ) {
     const { pattern, selfArg } = filter
-    this.pattern = pattern != null ? new FilteringWithPattern(pattern) : undefined
+    this.pattern = pattern ? new FilteringWithPattern(pattern) : undefined
     this.selfArg = selfArg
   }