@asd20/ui-next 2.12.0 → 2.12.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.12.1](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.12.0...ui-next-v2.12.1) (2026-05-26)
+
+
+### Bug Fixes
+
+* add group matches to people searches by keyword ([1edabb4](https://github.com/academydistrict20/asd20-ui-next/commit/1edabb458ead8430e04375cdb00071db345605f3))
+
 # [2.12.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.11.1...ui-next-v2.12.0) (2026-05-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asd20/ui-next",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "private": false,
   "description": "ASD20 UI component library for Vue 3.",
   "license": "MIT",

package/src/components/organisms/Asd20SiteSearch/index.vue

@@ -1357,21 +1357,78 @@ export default {
     async queryPeopleWithFallback(payload) {
       if (typeof this.queryPeopleHandler === 'function') {
         const result = await this.queryPeopleHandler(payload)
-        if (Array.isArray(result)) return result
-        return result && Array.isArray(result.people) ? result.people : []
+        if (Array.isArray(result)) {
+          return { people: result, groups: [] }
+        }
+        return {
+          people: result && Array.isArray(result.people) ? result.people : [],
+          groups: result && Array.isArray(result.groups) ? result.groups : [],
+        }
       }
 
       const searchStore = this.getSearchStore()
       if (searchStore) {
-        await searchStore.dispatch('search/queryPeople', payload)
-        return Array.isArray(this.resolvedPeople) ? this.resolvedPeople : []
+        const result = await searchStore.dispatch('search/queryPeople', payload)
+        return {
+          people:
+            result && Array.isArray(result.people)
+              ? result.people
+              : Array.isArray(this.resolvedPeople)
+              ? this.resolvedPeople
+              : [],
+          groups: result && Array.isArray(result.groups) ? result.groups : [],
+        }
       }
 
       const { people } = await queryPeople({
         ...payload,
         runtimeConfig: this.resolveRuntimeConfig(),
       })
-      return Array.isArray(people) ? people : []
+      return {
+        people: Array.isArray(people) ? people : [],
+        groups: [],
+      }
+    },
+
+    getContactGroupKey(group = {}) {
+      return String(group.id || group.title || group.contactEmail || '').trim()
+    },
+
+    mergeContactGroups(primaryGroups = [], relatedGroups = []) {
+      const merged = []
+      const keyedIndexes = new Map()
+      const addGroup = group => {
+        if (!group || typeof group !== 'object') return
+        const key = this.getContactGroupKey(group)
+        if (!key) return
+
+        if (keyedIndexes.has(key)) {
+          const existingIndex = keyedIndexes.get(key)
+          const existing = merged[existingIndex]
+          if (
+            existing &&
+            existing.relatedPersonMatch &&
+            !group.relatedPersonMatch
+          ) {
+            merged[existingIndex] = group
+          }
+          return
+        }
+
+        keyedIndexes.set(key, merged.length)
+        merged.push(group)
+      }
+
+      primaryGroups.forEach(addGroup)
+      relatedGroups.forEach(addGroup)
+
+      return merged
+    },
+
+    getDirectContactGroups() {
+      return (this.currentGroups || []).filter(
+        group => !(group && group.relatedPersonMatch)
+      )
     },
 
     isLocalDevelopmentHost(hostname = '') {
@@ -2587,8 +2644,27 @@ export default {
       return ownerFilters
     },
 
+    selectBestKeywordTabAfterContactResults({ runId, text } = {}) {
+      if (!this.isCurrentSearchRun(runId)) return
+      if (this.searchMode !== 'keyword') return
+      if (this.currentTab !== 'Pages') return
+      if (this.currentPages.length > 0 || this.contactResultCount === 0)
+        return
+
+      this.currentTab = 'Contacts'
+      this.syncSearchState({
+        text: text || this.searchQuestion || this.inputText,
+        mode: 'keyword',
+        tab: 'Contacts',
+      })
+      this.$nextTick(() => this.refreshResultsScrollLayer())
+    },
+
     async searchGroups(options = {}) {
       const runId = options.runId || this.searchRunId
+      const existingRelatedGroups = (this.currentGroups || []).filter(
+        group => group && group.relatedPersonMatch
+      )
       const searchInput = {
         keywords: this.keywords,
         question: this.searchQuestion || this.inputText,
@@ -2603,16 +2679,24 @@ export default {
       if (!this.isCurrentSearchRun(runId)) {
         return Array.from(
           new Set(
-            this.currentGroups
+            this.getDirectContactGroups()
               .map(group => (group && group.title ? group.title.trim() : ''))
               .filter(Boolean)
           )
         )
       }
+      if (existingRelatedGroups.length > 0) {
+        this.setSearchResults({
+          groups: this.mergeContactGroups(
+            this.currentGroups,
+            existingRelatedGroups
+          ),
+        })
+      }
       this.persistSearchCacheSnapshot()
       return Array.from(
         new Set(
-          (this.currentGroups || [])
+          this.getDirectContactGroups()
             .map(group => (group && group.title ? group.title.trim() : ''))
             .filter(Boolean)
         )
@@ -2629,13 +2713,27 @@ export default {
       this.searchingPeople = true
       try {
         let people = []
+        let relatedGroups = []
         try {
-          people = await this.queryPeopleWithFallback(searchInput)
+          const result = await this.queryPeopleWithFallback(searchInput)
+          people = Array.isArray(result)
+            ? result
+            : result && Array.isArray(result.people)
+            ? result.people
+            : []
+          relatedGroups =
+            result && Array.isArray(result.groups) ? result.groups : []
         } catch (error) {
           people = []
+          relatedGroups = []
         }
         if (!this.isCurrentSearchRun(runId)) return this.currentPeople
         this.setSearchResults({ people })
+        if (relatedGroups.length > 0) {
+          this.setSearchResults({
+            groups: this.mergeContactGroups(this.currentGroups, relatedGroups),
+          })
+        }
         this.persistSearchCacheSnapshot()
         return this.currentPeople
       } finally {
@@ -2679,6 +2777,10 @@ export default {
         this.keywords = this.limitWords(text, 4)
         await this.searchPages({ keepAnswersTab: false, runId })
         this.searchFilesWithGroupOwners({ runId })
+          .then(() =>
+            this.selectBestKeywordTabAfterContactResults({ runId, text })
+          )
+          .catch(() => {})
         if (!this.isCurrentSearchRun(runId)) return
         this.currentTab = 'Pages'
         this.syncSearchState({ text, mode, tab: 'Pages' })