Request only needed values

https://coveord.atlassian.net/browse/JSUI-1879
coveo · Oct 24, 2017 · cd63fae · cd63fae
1 parent 7146847
commit cd63fae
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/controllers/FacetQueryController.ts b/src/controllers/FacetQueryController.ts
@@ -103,6 +103,8 @@ export class FacetQueryController {
    * @returns {Promise|Promise<T>}
    */
   public search(params: FacetSearchParameters, oldLength = params.nbResults): Promise<IIndexFieldValue[]> {
+    // For search, we want to retrieve the exact values we requested, and not additional ones
+    params.completeFacetWithStandardValues = false;
     return new Promise((resolve, reject) => {
       const onResult = (fieldValues?: IIndexFieldValue[]) => {
         const newLength = fieldValues.length;

diff --git a/src/ui/Facet/FacetSearchParameters.ts b/src/ui/Facet/FacetSearchParameters.ts
@@ -17,6 +17,7 @@ export class FacetSearchParameters {
   public alwaysExclude: string[] = [];
   public sortCriteria = 'occurrences';
   public fetchMore = false;
+  public completeFacetWithStandardValues = true;
 
   constructor(public facet: Facet) {
     this.nbResults = facet.options.numberOfValuesInFacetSearch;
@@ -54,18 +55,26 @@ export class FacetSearchParameters {
       typedByUser = ['*' + this.valueToSearch + '*'];
     }
 
-    let completeFacetWithStandardValues = true;
+    let allowedValues;
+    if (this.valueToSearch) {
+      allowedValues = typedByUser
+        .concat(this.alwaysInclude)
+        .concat(this.alwaysExclude)
+    } else {
+      allowedValues = _.compact(
+        typedByUser
+          .concat(this.alwaysInclude)
+          .concat(this.facet.options.allowedValues)
+      )
+    }
+
+    let completeFacetWithStandardValues = this.completeFacetWithStandardValues;
     if (this.facet.options.lookupField != null) {
       completeFacetWithStandardValues = false;
     }
 
     const request: IGroupByRequest = {
-      allowedValues: _.compact(
-        typedByUser
-          .concat(this.alwaysInclude)
-          .concat(this.alwaysExclude)
-          .concat(this.facet.options.allowedValues)
-      ),
+      allowedValues: allowedValues,
       maximumNumberOfValues: nbResults,
       completeFacetWithStandardValues: completeFacetWithStandardValues,
       field: <string>this.facet.options.field,

diff --git a/src/ui/Facet/FacetValues.ts b/src/ui/Facet/FacetValues.ts
@@ -33,13 +33,17 @@ export class FacetValue {
     this.computedField = newValue.computedField;
   }
 
-  cloneWithZeroOccurrences(): FacetValue {
-    this.occurrences = 0;
+  clone(): FacetValue {
     this.computedField = undefined;
     this.delta = undefined;
     return this;
   }
 
+  cloneWithZeroOccurrences(): FacetValue {
+    this.occurrences = 0;
+    return this.clone();
+  }
+
   cloneWithDelta(count: number, delta: number): FacetValue {
     Assert.isLargerOrEqualsThan(0, count);
     var clone = this.cloneWithZeroOccurrences();
@@ -192,7 +196,11 @@ export class FacetValues {
       if (Utils.exists(myValue)) {
         myValue.selected = true;
       } else {
-        this.values.push(otherValue.cloneWithZeroOccurrences());
+        if (otherValue.occurrences) {
+          this.values.push(otherValue.clone())
+        } else {
+          this.values.push(otherValue.cloneWithZeroOccurrences());
+        }
       }
     });