@asd20/ui-next 2.10.2 → 2.10.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.10.4](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.10.3...ui-next-v2.10.4) (2026-05-14)
+
+
+### Bug Fixes
+
+* fix semantic markup for search component ([d63ce71](https://github.com/academydistrict20/asd20-ui-next/commit/d63ce71b149db115813fda8ff14e905612c526ba))
+
+## [2.10.3](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.10.2...ui-next-v2.10.3) (2026-05-13)
+
+
+### Bug Fixes
+
+* fix 404 recommending related pages from other orgs ([4893091](https://github.com/academydistrict20/asd20-ui-next/commit/4893091a2859cca4555f05d956b25eb251722903))
+
 ## [2.10.2](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.10.1...ui-next-v2.10.2) (2026-05-13)
 
 ## [2.10.1](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.10.0...ui-next-v2.10.1) (2026-05-12)

package/package.json

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

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

@@ -32,8 +32,7 @@
                 !searchingAi
             "
             title="Ask a Question or Search by Keyword"
-            description="Asking a <b>question</b> will generate an AI answer with related pages and files. Or just search for pages and files by entering <b>keyword(s)</b>.
-              <hr/>AI can make mistakes. Verify important information."
+            :description="idleSearchDescription"
           />
           <div
             v-if="showSearchInputBeforeResults"
@@ -268,8 +267,7 @@
                 !searchingAi
             "
             title="Ask a Question or Search by Keyword"
-            description="Asking a <b>question</b> will generate an AI answer with related pages and files. Or just search for pages and files by entering <b>keyword(s)</b>.
-              <hr/>AI can make mistakes. Verify important information."
+            :description="idleSearchDescription"
           />
           <asd20-notification
             v-if="aiErrorMessage"
@@ -320,8 +318,7 @@
                 !searchingAi
             "
             title="Ask a Question or Search by Keyword"
-            description="Asking a <b>question</b> will generate an AI answer with related pages and files. Or just search for pages and files by entering <b>keyword(s)</b>.
-              <hr/>AI can make mistakes. Verify important information."
+            :description="idleSearchDescription"
           />
           <asd20-notification
             v-if="
@@ -377,8 +374,7 @@
                 !searchingAi
             "
             title="Ask a Question or Search by Keyword"
-            description="Asking a <b>question</b> will generate an AI answer with related pages and files. Or just search for pages and files by entering <b>keyword(s)</b>.
-              <hr/>AI can make mistakes. Verify important information."
+            :description="idleSearchDescription"
           />
           <asd20-notification
             v-if="keywords && currentFiles.length === 0 && !searchingFiles"
@@ -581,6 +577,11 @@ const SEARCH_NO_PAGE_RESULTS_FALLBACKS = NO_PAGE_RESULTS_FALLBACKS.map(
     ownerOrganizationId: DISTRICT_ORG_ID,
   })
 )
+const IDLE_SEARCH_DESCRIPTION = [
+  'Asking a <strong>question</strong> will generate an AI answer with related pages and files. ',
+  'Or just search for pages and files by entering <strong>keyword(s)</strong>.',
+  '<hr/>AI can make mistakes. Verify important information.',
+].join('')
 
 // const SUBDOMAIN_LABELS = {
 //   rampart: 'Rampart High School',
@@ -704,6 +705,10 @@ export default {
   }),
 
   computed: {
+    idleSearchDescription() {
+      return IDLE_SEARCH_DESCRIPTION
+    },
+
     currentPages() {
       if (Array.isArray(this.localSearchPages)) return this.localSearchPages
       return Array.isArray(this.resolvedPages) ? this.resolvedPages : []

package/src/components/templates/Asd20404Template/index.vue

@@ -87,6 +87,7 @@ import pageTemplateMixin from '../../../mixins/pageTemplateMixin'
 // import Asd20PageContent from '../../../components/organisms/Asd20PageContent'
 
 const MAX_SUGGESTED_PAGES = 10
+
 export default {
   components: {
     Asd20List,
@@ -95,6 +96,9 @@ export default {
     // Asd20PageContent,
   },
   mixins: [pageTemplateMixin],
+  props: {
+    queryPagesHandler: { type: Function, default: null },
+  },
 
   data: () => ({
     suggestedPagesListItems: [],
@@ -130,6 +134,56 @@ export default {
         )
       )
     },
+    getCurrentOrganizationId() {
+      return this.organization && this.organization.id
+        ? String(this.organization.id).trim()
+        : ''
+    },
+    getSuggestedPageOrganizationId(page = {}) {
+      if (typeof page.ownerOrganizationId === 'string') {
+        return page.ownerOrganizationId.trim()
+      }
+
+      if (
+        page.ownerOrganization &&
+        typeof page.ownerOrganization.id === 'string'
+      ) {
+        return page.ownerOrganization.id.trim()
+      }
+
+      return ''
+    },
+    isSuggestedPageForCurrentOrganization(page = {}) {
+      if (page.isNoResultsFallback) return true
+
+      const currentOrganizationId = this.getCurrentOrganizationId()
+      if (!currentOrganizationId) return true
+
+      return this.getSuggestedPageOrganizationId(page) === currentOrganizationId
+    },
+    getSuggestedPageSearchPayload(keywords = '') {
+      const organizationId = this.getCurrentOrganizationId()
+
+      return {
+        keywords,
+        top: MAX_SUGGESTED_PAGES,
+        organizations: organizationId ? [organizationId] : [],
+        includeDistrictResults: false,
+      }
+    },
+    async querySuggestedPages(keywords = '') {
+      const payload = this.getSuggestedPageSearchPayload(keywords)
+
+      if (typeof this.queryPagesHandler === 'function') {
+        const result = await this.queryPagesHandler(payload)
+
+        return Array.isArray(result) ? result : result?.pages || []
+      }
+
+      const { pages } = await queryPages(payload)
+
+      return pages
+    },
     getSuggestedPageDedupKey(page = {}) {
       const normalizedUrl = this.normalizeSearchText(page.url || '')
 
@@ -174,10 +228,12 @@ export default {
       return keywordTokens.some(token => haystack.includes(token))
     },
     sanitizeSuggestedPages(pages = [], keywords = '') {
-      const dedupedPages = this.dedupeSuggestedPages(
+      const organizationPages = this.dedupeSuggestedPages(
         Array.isArray(pages) ? pages : []
+      ).filter(page =>
+        this.isSuggestedPageForCurrentOrganization(page)
       )
-      const relevantPages = dedupedPages.filter(page =>
+      const relevantPages = organizationPages.filter(page =>
         this.isRelevantSuggestedPage(page, keywords)
       )
       const resolvedPages = relevantPages.length
@@ -193,7 +249,7 @@ export default {
           .trim()
           .toLowerCase()
         try {
-          const { pages } = await queryPages({ keywords, top: MAX_SUGGESTED_PAGES })
+          const pages = await this.querySuggestedPages(keywords)
 
           this.suggestedPagesListItems = mapPagesToListItems(
             this.sanitizeSuggestedPages(pages, keywords)

package/src/helpers/queryPages.js

@@ -75,13 +75,11 @@ function searchPayload(state) {
   //   )
   // }
 
-  // if (state.organizations.length > 0) {
-  //   filters.push(
-  //     `organizations/any(t: search.in(t, '${state.organizations.join(
-  //       ','
-  //     )}', ',')) `
-  //   )
-  // }
+  if (state.organizations.length > 0) {
+    filters.push(
+      `search.in(ownerOrganizationId, '${state.organizations.join(',')}', ',')`
+    )
+  }
 
   let payload = {
     count: true,