Merge pull request #107 from dbmi-pitt/maxsibilla/publication-update

Updating includeFilter support to map to should instead of must
dbmi-pitt · Oct 22, 2024 · 6b7d38e · 6b7d38e
2 parents 95de585 + 33b7665
commit 6b7d38e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/components/core/TermFacet.jsx b/components/core/TermFacet.jsx
@@ -77,7 +77,7 @@ export default function TermFacet({
             {options.length > 5 && !moreExpanded && (
                 <button
                     type='button'
-                    class='sui-facet-view-more'
+                    className='sui-facet-view-more'
                     aria-label='Show more options'
                     onClick={handleMoreClick}
                 >

diff --git a/lib/search-tools.js b/lib/search-tools.js
@@ -49,14 +49,16 @@ export function esQueryBuilder(request, config, authState) {
         const fields = Object.keys(config.search_fields)
         const search = esb.multiMatchQuery(fields, request.searchTerm)
         query = query.must(search)
+        // Whenever a searchTerm is specified we want to remove the default sort order
+        request.sortList = []
     } else if (config.includeFilters && config.includeFilters.length > 0) {
-        const includeFilters = config.excludeFilters
+        const includeFilters = config.includeFilters
         const f = Array(includeFilters.length)
         for (let i = 0; i < includeFilters.length; i++) {
             // Only support term filter for now
             f[i] = esb.termsQuery(includeFilters[i].field, includeFilters[i].values)
         }
-        query = query.must(f)
+        query = query.should(f)
     } else {
         query = query.must(esb.matchAllQuery())
     }