fix: support None in facet doc count

Also sort selected facets first
openfoodfacts · Jun 4, 2024 · ae62e30 · ae62e30
1 parent 7665315
commit ae62e30
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/app/_types.py b/app/_types.py
@@ -14,7 +14,7 @@ class FacetItem(BaseModel):
 
     key: str
     name: str
-    count: int
+    count: Optional[int]
     """The number of elements for this value"""
 
     selected: bool

diff --git a/app/facets.py b/app/facets.py
@@ -98,23 +98,37 @@ def build_facets(
                     # TODO: translate in target language ?
                     name="Other",
                     count=agg_data["sum_other_doc_count"],
+                    selected=False,
                 )
             )
-        items_count = sum(item.count or 0 for item in facet_items)
+        # 2024-06-04: Alex: removed as we don't support it yet
+        # at request construction time
+        #
+        # items_count = sum(item.count or 0 for item in facet_items)
         # and empty values if there are some (taking into account error margin)
-        if (not search_result.is_count_exact) and search_result.count > (
-            items_count + count_error_margin
-        ):
-            facet_items.append(
-                FacetItem(
-                    key="--none--",
-                    # TODO: translate in target language ?
-                    name="None",
-                    # Note: this depends on search_result.is_count_exact,
-                    # but we leave it to user to verify
-                    count=search_result.count - items_count,
-                )
+        # if (not search_result.is_count_exact) and search_result.count > (
+        #     items_count + count_error_margin
+        # ):
+        #     facet_items.append(
+        #         FacetItem(
+        #             key="--none--",
+        #             # TODO: translate in target language ?
+        #             name="None",
+        #             # Note: this depends on search_result.is_count_exact,
+        #             # but we leave it to user to verify
+        #             count=search_result.count - items_count,
+        #             # FIXME: compute selected !
+        #             selected=False,
+        #         )
+        #     )
+        # re-order to have selected first
+        facet_items = [
+            item
+            for i, item in sorted(
+                enumerate(facet_items),
+                key=lambda i_item: (not i_item[1].selected, i_item[0]),
             )
+        ]
         # append our facet information
         facets[field_name] = FacetInfo(
             # FIXME translate field name in target language

diff --git a/frontend/src/search-facets.ts b/frontend/src/search-facets.ts
@@ -1,4 +1,4 @@
-import {LitElement, html, css} from 'lit';
+import {LitElement, html, nothing, css} from 'lit';
 import {customElement, property, queryAssignedNodes} from 'lit/decorators.js';
 import {repeat} from 'lit/directives/repeat.js';
 
@@ -158,7 +158,11 @@ export class SearchaliciousTermsFacet extends SearchaliciousFacet {
    * Create the search term based upon the selected terms
    */
   override searchFilter(): string | undefined {
-    const values = Object.keys(this.selectedTerms);
+    let values = Object.keys(this.selectedTerms);
+    // add quotes if we have ":" in values
+    values = values.map((value) =>
+      value.includes(':') ? `"${value}"` : value
+    );
     if (values.length === 0) {
       return undefined;
     }
@@ -181,7 +185,10 @@ export class SearchaliciousTermsFacet extends SearchaliciousFacet {
           ?checked=${this.selectedTerms[term.key]}
           @change=${this.setTermSelected}
         /><label for="${term.key}"
-          >${term.name} <span part="docCount">(${term.count})</span></label
+          >${term.name}
+          ${term.count
+            ? html`<span part="docCount">(${term.count})</span>`
+            : nothing}</label
         >
       </div>
     `;