Merge pull request #98 from dbmi-pitt/tjmadonna/hierarchy-facet-fix

Tjmadonna/hierarchy facet fix
dbmi-pitt · Sep 25, 2024 · f6cb332 · f6cb332
2 parents fed440b + d73d631
commit f6cb332
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/components/core/HierarchicalCheckboxOptionFacet.jsx b/components/core/HierarchicalCheckboxOptionFacet.jsx
@@ -13,10 +13,10 @@ const HierarchicalCheckboxOptionFacet = ({
     const [isExpanded, setIsExpanded] = useState(false)
 
     const getOptionCheckedState = () => {
-        let checked = true
+        let checked = false
         for (const subval of option.subvalues) {
-            if (!filterExists(field, subval.value)) {
-                checked = false
+            if (filterExists(field, subval.value)) {
+                checked = true
                 break
             }
         }
@@ -63,6 +63,10 @@ const HierarchicalCheckboxOptionFacet = ({
         setIsExpanded(!isExpanded)
     }
 
+    if (option.subvalues.length === 0) {
+        return null
+    }
+
     return (
         <div className='d-flex flex-column align-items-start w-100'>
             {/* Label and checkbox */}

diff --git a/lib/search-tools.js b/lib/search-tools.js
@@ -74,16 +74,14 @@ export function es_query_builder(request, queryConfig) {
     let post_filter_agg = null
     const includeExistAggs = {}
     FILTERS.forEach((f) => {
-        //log.info(f[1])
-        let field = f[1].field + '.keyword'
-        let values = f[1].values
+        const values = f[1].values
 
-        let filterBoolQuery = esb.boolQuery();
+        const filterBoolQuery = esb.boolQuery();
 
         values.forEach((v) => {
-            var facet_info = checkFilterType(f[1].field, FACETS)
+            const facet_info = checkFilterType(f[1].field, FACETS)
             if (facet_info[1] && facet_info[1]["type"] === 'range') {
-                var element = createRangeQuery(v, facet_info)
+                const element = createRangeQuery(v, facet_info)
 
                 // If the field is a disjunctive facet and multiple items are selected we need to wrap those options
                 // in a `should` boolean query
@@ -107,6 +105,9 @@ export function es_query_builder(request, queryConfig) {
                 }
                 includeExistAggs[f[1].field] = [v]
             } else {
+                const name = f[1].field
+                const field = queryConfig.facets[name].field
+
                 // If the field is a disjunctive facet and multiple items are selected we need to wrap those options
                 // in a `should` boolean query
                 if (values.length > 1) {